From a9d95db49da6e99c3dbe06f3c81846b4db019059 Mon Sep 17 00:00:00 2001
From: santosh-pingle <86107848+santosh-pingle@users.noreply.github.com>
Date: Wed, 22 Feb 2023 22:35:26 +0530
Subject: [PATCH 1/6] DateTime Picker : Do not enable time input if date
 textfield is empty, do not show error message if date input is valid. (#1871)

* Do not enable time input if date textfield is empty, do not show error message id date input is valid.

* Address review comments.

* Address inline comments.

* Avoid duplication of invalid date error text.

* Address inline comment.

* Address review comments.

* address my own comments

* BREAKS: rebind if draft answer changes

* Fix build failure.

* Rename test case and add one more assertion.

* breaking: cleaned up date time picker

* clear text on imporper answer

* disable time at the start

* use text in datebox to set datetime

* set edti text in date

* breaking: fix time disappering

* cleaner code

* init textwatcher once

* dont clear answer in change text

* simplify even more

* remove unneessary method

* fix tests

* fix tests

* final refactor

* final final comment fixes

* enable time picker on cal choosing date

* add a UI test to check if the answer gets saved

* Address comments

* address comments and cleanup tests

---------

Co-authored-by: Santosh Pingle <spingle@google.com>
Co-authored-by: omarismail <omarismail@google.com>
---
 .../component_date_time_picker.json           |  30 ++
 .../QuestionnaireUiEspressoTest.kt            |  99 ++++++-
 ...TimePickerViewHolderFactoryEspressoTest.kt |  92 +-----
 ...ionnaireItemDatePickerViewHolderFactory.kt |  36 +--
 ...aireItemDateTimePickerViewHolderFactory.kt | 280 ++++++------------
 .../views/QuestionnaireItemViewItem.kt        |  11 +-
 ...ItemDateTimePickerViewHolderFactoryTest.kt |  78 +++--
 7 files changed, 282 insertions(+), 344 deletions(-)
 create mode 100644 datacapture/sampledata/component_date_time_picker.json

diff --git a/datacapture/sampledata/component_date_time_picker.json b/datacapture/sampledata/component_date_time_picker.json
new file mode 100644
index 0000000000..1084fe3225
--- /dev/null
+++ b/datacapture/sampledata/component_date_time_picker.json
@@ -0,0 +1,30 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Schedule an appointment",
+      "type": "dateTime",
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "1-most-recent",
+          "text": "Select a date 4 weeks from now",
+          "type": "display"
+        }
+      ]
+    }
+  ]
+}
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
index 7da5b72339..b5d551ac28 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -21,6 +21,7 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.add
 import androidx.fragment.app.commitNow
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
@@ -29,9 +30,13 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.QUESTIONNAIRE_FILE_PATH_KEY
 import com.google.android.fhir.datacapture.test.R
+import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.utilities.clickOnText
+import com.google.android.fhir.datacapture.views.localDateTime
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
+import java.time.LocalDateTime
+import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -54,16 +59,9 @@ class QuestionnaireUiEspressoTest {
 
   @Test
   fun shouldDisplayReviewButtonWhenNoMorePagesToDisplay() {
-    val bundle =
-      bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to "/paginated_questionnaire_with_dependent_answer.json")
-    activityScenarioRule.scenario.onActivity { activity ->
-      activity.supportFragmentManager.commitNow {
-        setReorderingAllowed(true)
-        add<TestQuestionnaireFragment>(R.id.container_holder, args = bundle)
-      }
-    }
+    buildFragmentFromQuestionnaire("/paginated_questionnaire_with_dependent_answer.json")
 
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(
           ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
@@ -71,13 +69,13 @@ class QuestionnaireUiEspressoTest {
       )
 
     clickOnText("Yes")
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE))
       )
 
     clickOnText("No")
-    onView(ViewMatchers.withId(R.id.review_mode_button))
+    onView(withId(R.id.review_mode_button))
       .check(
         ViewAssertions.matches(
           ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
@@ -87,17 +85,86 @@ class QuestionnaireUiEspressoTest {
 
   @Test
   fun integerTextEdit_inputOutOfRange_shouldShowError() {
-    val bundle = bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to "/text_questionnaire_integer.json")
+    buildFragmentFromQuestionnaire("/text_questionnaire_integer.json")
+
+    onView(withId(R.id.text_input_edit_text)).perform(typeText("12345678901"))
+    onView(withId(R.id.text_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo("Number must be between -2,147,483,648 and 2,147,483,647")
+    }
+  }
+
+  @Test
+  fun dateTimePicker_shouldShowErrorForWrongDate() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    // Add month and day. No need to add slashes as they are added automatically
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("0105"))
+
+    onView(withId(R.id.date_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
+    }
+    onView(withId(R.id.time_input_layout)).check { view, _ -> assertThat(view.isEnabled).isFalse() }
+  }
+
+  @Test
+  fun dateTimePicker_shouldEnableTimePickerWithCorrectDate_butNotSaveInQuestionnaireResponse() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("01052005"))
+
+    onView(withId(R.id.date_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo(null)
+    }
+
+    onView(withId(R.id.time_input_layout)).check { view, _ -> assertThat(view.isEnabled).isTrue() }
+
+    assertThat(getQuestionnaireResponse().item.size).isEqualTo(1)
+    assertThat(getQuestionnaireResponse().item.first().answer.size).isEqualTo(0)
+  }
+
+  @Test
+  fun dateTimePicker_shouldSetAnswerWhenDateAndTimeAreFilled() {
+    buildFragmentFromQuestionnaire("/component_date_time_picker.json")
+
+    onView(withId(R.id.date_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("01052005"))
+
+    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
+    clickOnText("AM")
+    clickOnText("6")
+    clickOnText("10")
+    clickOnText("OK")
+
+    val answer = getQuestionnaireResponse().item.first().answer.first().valueDateTimeType
+
+    assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 6, 10))
+  }
+
+  private fun buildFragmentFromQuestionnaire(fileName: String) {
+    val bundle = bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to fileName)
     activityScenarioRule.scenario.onActivity { activity ->
       activity.supportFragmentManager.commitNow {
         setReorderingAllowed(true)
         add<TestQuestionnaireFragment>(R.id.container_holder, args = bundle)
       }
     }
-    onView(withId(R.id.text_input_edit_text)).perform(typeText("12345678901"))
-    onView(withId(R.id.text_input_layout)).check { view, _ ->
-      val actualError = (view as TextInputLayout).error
-      assertThat(actualError).isEqualTo("Number must be between -2,147,483,648 and 2,147,483,647")
+  }
+  private fun getQuestionnaireResponse(): QuestionnaireResponse {
+    var testQuestionnaireFragment: QuestionnaireFragment? = null
+    activityScenarioRule.scenario.onActivity { activity ->
+      testQuestionnaireFragment =
+        activity.supportFragmentManager
+          .findFragmentById(R.id.container_holder)
+          ?.childFragmentManager?.findFragmentById(R.id.container) as QuestionnaireFragment
     }
+    return testQuestionnaireFragment!!.getQuestionnaireResponse()
   }
 }
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
index 7c0b5c879c..433e7ed78f 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
@@ -18,7 +18,6 @@ package com.google.android.fhir.datacapture.views
 
 import android.view.View
 import android.widget.FrameLayout
-import android.widget.TextView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -33,7 +32,6 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.common.truth.Truth.assertThat
 import org.hamcrest.CoreMatchers.allOf
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -54,95 +52,11 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
   private lateinit var viewHolder: QuestionnaireItemViewHolder
   @Before
   fun setup() {
-    activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
+    activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
     viewHolder = QuestionnaireItemDateTimePickerViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
-  @Test
-  fun shouldSetFirstDateInputThenTimeInput() {
-    val questionnaireItemView =
-      QuestionnaireItemViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isEmpty()
-
-    onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-  }
-
-  @Test
-  fun shouldSetFirstTimeInputThenDateInput() {
-    val questionnaireItemView =
-      QuestionnaireItemViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isEmpty()
-
-    onView(withId(R.id.time_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-    onView(withId(R.id.date_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.date_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-    assertThat(
-        viewHolder.itemView.findViewById<TextView>(R.id.time_input_edit_text).text.toString()
-      )
-      .isNotEmpty()
-  }
-
   @Test
   fun showsTimePickerInInputMode() {
     val questionnaireItemView =
@@ -189,12 +103,12 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
 
   /** Method to run code snippet on UI/main thread */
   private fun runOnUI(action: () -> Unit) {
-    activityScenarioRule.getScenario().onActivity { activity -> action() }
+    activityScenarioRule.scenario.onActivity { activity -> action() }
   }
 
   /** Method to set content view for test activity */
   private fun setTestLayout(view: View) {
-    activityScenarioRule.getScenario().onActivity { activity -> activity.setContentView(view) }
+    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
     InstrumentationRegistry.getInstrumentation().waitForIdleSync()
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
index 757c58c3ce..74912c6ac2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
@@ -17,6 +17,7 @@
 package com.google.android.fhir.datacapture.views
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
@@ -183,16 +184,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         } catch (e: ParseException) {
           displayValidationResult(
             Invalid(
-              listOf(
-                textInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "31")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
+              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
             )
           )
           if (questionnaireItemViewItem.answers.isNotEmpty()) {
@@ -213,7 +205,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         val textToDisplayInTheTextField =
           answer?.format(canonicalizedDatePattern) ?: draftAnswerToDisplay
 
-        // Since pull request #1822 has been merged, the same date format style is now used for both
+        // The same date format style is now used for both
         // accepting user date input and displaying the answer in the text field. For instance, the
         // "MM/dd/yyyy" format is employed to accept and display the date value. As a result, it is
         // possible to simply compare
@@ -228,16 +220,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         if (!draftAnswerToDisplay.isNullOrBlank()) {
           displayValidationResult(
             Invalid(
-              listOf(
-                textInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "31")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
+              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
             )
           )
         } else {
@@ -351,3 +334,14 @@ internal fun Int.length() =
     0 -> 1
     else -> log10(abs(toDouble())).toInt() + 1
   }
+
+/**
+ * Replaces 'dd' with '31', 'MM' with '01' and 'yyyy' with '2023' and returns new string. For
+ * example, given a `formatPattern` of dd/MM/yyyy, returns 31/01/2023
+ */
+internal fun invalidDateErrorText(context: Context, formatPattern: String) =
+  context.getString(
+    R.string.date_format_validation_error_msg,
+    formatPattern,
+    formatPattern.replace("dd", "31").replace("MM", "01").replace("yyyy", "2023")
+  )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
index 9ca6abb52c..374f59429e 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
@@ -30,7 +30,6 @@ import com.google.android.fhir.datacapture.utilities.format
 import com.google.android.fhir.datacapture.utilities.getDateSeparator
 import com.google.android.fhir.datacapture.utilities.parseDate
 import com.google.android.fhir.datacapture.utilities.toLocalizedString
-import com.google.android.fhir.datacapture.utilities.toLocalizedTimeString
 import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
@@ -62,8 +61,6 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
       private lateinit var timeInputLayout: TextInputLayout
       private lateinit var timeInputEditText: TextInputEditText
       override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
-      private var localDate: LocalDate? = null
-      private var localTime: LocalTime? = null
       private lateinit var canonicalizedDatePattern: String
       private lateinit var textWatcher: DatePatternTextWatcher
 
@@ -84,19 +81,13 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           // from the view's context.
           val context = itemView.context.tryUnwrapContext()!!
           val localDateInput =
-            localDate
-              ?: questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localDate
-          createMaterialDatePicker(localDateInput)
+            questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localDate
+          buildMaterialDatePicker(localDateInput)
             .apply {
               addOnPositiveButtonClickListener { epochMilli ->
                 with(Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()) {
-                  localDate = this
-                  dateInputEditText.setText(localDate?.format(canonicalizedDatePattern))
-                  enableOrDisableTimePicker(enableIt = true)
-                  generateLocalDateTime(this, localTime)?.let {
-                    updateDateTimeInput(it, canonicalizedDatePattern)
-                    updateDateTimeAnswer(it)
-                  }
+                  dateInputEditText.setText(this?.format(canonicalizedDatePattern))
+                  timeInputLayout.isEnabled = true
                 }
                 // Clear focus so that the user can refocus to open the dialog
                 dateInputEditText.clearFocus()
@@ -108,56 +99,57 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
         timeInputLayout = itemView.findViewById(R.id.time_input_layout)
         timeInputEditText = itemView.findViewById(R.id.time_input_edit_text)
         timeInputEditText.inputType = InputType.TYPE_NULL
+        timeInputLayout.isEnabled = false
         timeInputLayout.setEndIconOnClickListener {
           // The application is wrapped in a ContextThemeWrapper in QuestionnaireFragment
           // and again in TextInputEditText during layout inflation. As a result, it is
           // necessary to access the base context twice to retrieve the application object
           // from the view's context.
           val context = itemView.context.tryUnwrapContext()!!
-          showMaterialTimePicker(context, INPUT_MODE_CLOCK)
+          buildMaterialTimePicker(context, INPUT_MODE_CLOCK)
         }
         timeInputEditText.setOnClickListener {
-          showMaterialTimePicker(itemView.context, INPUT_MODE_KEYBOARD)
+          buildMaterialTimePicker(itemView.context, INPUT_MODE_KEYBOARD)
         }
+        val localeDatePattern = getLocalizedDateTimePattern()
+        // Special character used in date pattern
+        val datePatternSeparator = getDateSeparator(localeDatePattern)
+        textWatcher = DatePatternTextWatcher(datePatternSeparator)
+        canonicalizedDatePattern = canonicalizeDatePattern(localeDatePattern)
       }
 
       @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
       override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
         clearPreviousState()
         header.bind(questionnaireItemViewItem.questionnaireItem)
-        val localeDatePattern = getLocalizedDateTimePattern()
-        // Special character used in date pattern
-        val datePatternSeparator = getDateSeparator(localeDatePattern)
-        textWatcher = DatePatternTextWatcher(datePatternSeparator)
-        canonicalizedDatePattern = canonicalizeDatePattern(localeDatePattern)
         dateInputLayout.hint = canonicalizedDatePattern
         dateInputEditText.removeTextChangedListener(textWatcher)
-        val dateTime = questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType
-        updateDateTimeInput(
-          dateTime?.let {
-            it.localDateTime.also {
-              localDate = it.toLocalDate()
-              localTime = it.toLocalTime()
-            }
-          },
-          canonicalizedDatePattern
-        )
-        dateInputEditText.addTextChangedListener(textWatcher)
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
-      }
+        val questionnaireItemViewItemDateTimeAnswer =
+          questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localDateTime
+
+        val dateStringToDisplay =
+          questionnaireItemViewItemDateTimeAnswer?.toLocalDate()?.format(canonicalizedDatePattern)
+            ?: questionnaireItemViewItem.draftAnswer as? String
+
+        // Determine whether the text field text should be overridden or not.
+        if (dateInputEditText.text.toString() != dateStringToDisplay) {
+          dateInputEditText.setText(dateStringToDisplay)
+        }
+
+        enableOrDisableTimePicker(questionnaireItemViewItem, dateStringToDisplay)
 
-      private fun displayValidationResult(validationResult: ValidationResult) {
-        displayDateValidationError(validationResult)
-        displayTimeValidationError(validationResult)
+        // If there is no set answer in the QuestionnaireItemViewItem, make the time field empty.
+        timeInputEditText.setText(
+          questionnaireItemViewItemDateTimeAnswer
+            ?.toLocalTime()
+            ?.toLocalizedString(timeInputEditText.context)
+            ?: ""
+        )
+        dateInputEditText.addTextChangedListener(textWatcher)
       }
 
       private fun displayDateValidationError(validationResult: ValidationResult) {
-        // Since the draft answer is still displayed in the text field, do not erase the error
-        // text if the answer is cleared and the validation result is valid.
-        if (questionnaireItemViewItem.answers.isEmpty() && validationResult == Valid) {
-          return
-        }
         dateInputLayout.error =
           when (validationResult) {
             is NotValidated,
@@ -166,118 +158,18 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           }
       }
 
-      fun displayTimeValidationError(validationResult: ValidationResult) {
-        timeInputLayout.error =
-          when (validationResult) {
-            is NotValidated,
-            Valid -> null
-            is Invalid ->
-              if (timeInputLayout.isEnabled) {
-                validationResult.getSingleStringValidationMessage()
-              } else {
-                null
-              }
-          }
-      }
-
       override fun setReadOnly(isReadOnly: Boolean) {
         // The system outside this delegate should only be able to mark it read only. Otherwise, it
         // will change the state set by this delegate in bindView().
         if (isReadOnly) {
-          setReadOnlyInternal(isReadOnly = true)
-        }
-      }
-
-      private fun setReadOnlyInternal(isReadOnly: Boolean) {
-        timeInputEditText.isEnabled = !isReadOnly
-        dateInputEditText.isEnabled = !isReadOnly
-        timeInputLayout.isEnabled = !isReadOnly
-        dateInputLayout.isEnabled = !isReadOnly
-      }
-
-      /** Update the date and time input fields in the UI. */
-      private fun updateDateTimeInput(
-        localDateTime: LocalDateTime?,
-        canonicalizedDatePattern: String
-      ) {
-        enableOrDisableTimePicker(enableIt = localDateTime != null)
-        val draftAnswerToDisplay = questionnaireItemViewItem.draftAnswer as? String
-        val textToDisplayInTheTextField =
-          localDateTime?.toLocalDate()?.format(canonicalizedDatePattern) ?: draftAnswerToDisplay
-
-        // Since pull request #1822 has been merged, the same date format style is now used for both
-        // accepting user date input and displaying the answer in the text field. For instance, the
-        // "MM/dd/yyyy" format is employed to accept and display the date value. As a result, it is
-        // possible to simply compare the
-        // text field text to the partial or valid answer to determine whether the text field text
-        // should be overridden or not.
-        if (dateInputEditText.text.toString() != textToDisplayInTheTextField) {
-          dateInputEditText.setText(textToDisplayInTheTextField)
-          displayDateValidationError(Valid)
-          enableOrDisableTimePicker(enableIt = true)
-        }
-        // Show an error text
-        if (!draftAnswerToDisplay.isNullOrBlank()) {
-          displayValidationResult(
-            Invalid(
-              listOf(
-                dateInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "01")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
-            )
-          )
-        } else {
-          displayValidationResult(NotValidated)
-        }
-
-        timeInputEditText.setText(
-          localDateTime?.toLocalizedTimeString(timeInputEditText.context) ?: ""
-        )
-      }
-
-      /** Updates the recorded answer. */
-      private fun updateDateTimeAnswer(localDateTime: LocalDateTime) {
-        questionnaireItemViewItem.setAnswer(
-          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
-            .setValue(
-              DateTimeType(
-                Date(
-                  localDateTime.year - 1900,
-                  localDateTime.monthValue - 1,
-                  localDateTime.dayOfMonth,
-                  localDateTime.hour,
-                  localDateTime.minute,
-                  localDateTime.second
-                )
-              )
-            )
-        )
-      }
-
-      private fun generateLocalDateTime(
-        localDate: LocalDate?,
-        localTime: LocalTime?
-      ): LocalDateTime? {
-        return when {
-          localDate != null && localTime != null -> {
-            LocalDateTime.of(localDate, localTime)
-          }
-          localDate != null -> {
-            questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.let {
-              LocalDateTime.of(localDate, it.localTime)
-            }
-          }
-          else -> null
+          dateInputEditText.isEnabled = false
+          dateInputLayout.isEnabled = false
+          timeInputEditText.isEnabled = false
+          timeInputLayout.isEnabled = false
         }
       }
 
-      private fun createMaterialDatePicker(localDate: LocalDate?): MaterialDatePicker<Long> {
+      private fun buildMaterialDatePicker(localDate: LocalDate?): MaterialDatePicker<Long> {
         val selectedDateMillis =
           localDate?.atStartOfDay(ZONE_ID_UTC)?.toInstant()?.toEpochMilli()
             ?: MaterialDatePicker.todayInUtcMilliseconds()
@@ -288,17 +180,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           .build()
       }
 
-      private fun clearPreviousState() {
-        localDate = null
-        localTime = null
-        setReadOnlyInternal(isReadOnly = false)
-      }
-
-      private fun enableOrDisableTimePicker(enableIt: Boolean) {
-        timeInputLayout.isEnabled = enableIt
-      }
-
-      private fun showMaterialTimePicker(context: Context, inputMode: Int) {
+      private fun buildMaterialTimePicker(context: Context, inputMode: Int) {
         val selectedTime =
           questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localTime
             ?: LocalTime.now()
@@ -318,12 +200,13 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           .apply {
             addOnPositiveButtonClickListener {
               with(LocalTime.of(this.hour, this.minute, 0)) {
-                localTime = this
                 timeInputEditText.setText(this.toLocalizedString(context))
-                generateLocalDateTime(localDate, this)?.let {
-                  updateDateTimeInput(it, canonicalizedDatePattern)
-                  updateDateTimeAnswer(it)
-                }
+                setQuestionnaireItemViewItemAnswer(
+                  LocalDateTime.of(
+                    parseDate(dateInputEditText.text.toString(), canonicalizedDatePattern),
+                    this
+                  )
+                )
                 timeInputEditText.clearFocus()
               }
             }
@@ -331,47 +214,51 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           .show(context.tryUnwrapContext()!!.supportFragmentManager, TAG_TIME_PICKER)
       }
 
-      private fun updateAnswerAfterTextChanged(text: String?) {
-        if (text.isNullOrEmpty()) {
-          questionnaireItemViewItem.clearAnswer()
-          questionnaireItemViewItem.setDraftAnswer(text.toString())
-          return
-        }
+      /** Set the answer in the [QuestionnaireResponse]. */
+      private fun setQuestionnaireItemViewItemAnswer(localDateTime: LocalDateTime) {
+        questionnaireItemViewItem.setAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+            .setValue(
+              DateTimeType(
+                Date(
+                  localDateTime.year - 1900,
+                  localDateTime.monthValue - 1,
+                  localDateTime.dayOfMonth,
+                  localDateTime.hour,
+                  localDateTime.minute,
+                  localDateTime.second
+                )
+              )
+            )
+        )
+      }
+
+      private fun clearPreviousState() {
+        dateInputEditText.isEnabled = true
+        dateInputLayout.isEnabled = true
+      }
+
+      /* If the passed in date can be parsed, then enable the time picker, otherwise, keep the time
+      picker disabled and display an error
+       */
+      private fun enableOrDisableTimePicker(
+        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        dateToDisplay: String?
+      ) =
         try {
-          localDate = parseDate(text, canonicalizedDatePattern)
-          questionnaireItemViewItem.setDraftAnswer(text.toString())
-          displayDateValidationError(Valid)
-          enableOrDisableTimePicker(enableIt = true)
-          generateLocalDateTime(localDate, localTime)?.run {
-            updateDateTimeInput(this, canonicalizedDatePattern)
-            updateDateTimeAnswer(this)
+          if (dateToDisplay != null) {
+            parseDate(dateToDisplay, canonicalizedDatePattern)
+            timeInputLayout.isEnabled = true
           }
+          displayDateValidationError(questionnaireItemViewItem.validationResult)
         } catch (e: ParseException) {
+          timeInputLayout.isEnabled = false
           displayDateValidationError(
             Invalid(
-              listOf(
-                dateInputEditText.context.getString(
-                  R.string.date_format_validation_error_msg,
-                  canonicalizedDatePattern,
-                  canonicalizedDatePattern
-                    .replace("dd", "31")
-                    .replace("MM", "01")
-                    .replace("yyyy", "2023")
-                )
-              )
+              listOf(invalidDateErrorText(dateInputEditText.context, canonicalizedDatePattern))
             )
           )
-          if (!timeInputLayout.isEnabled) {
-            displayTimeValidationError(Valid)
-          }
-          if (questionnaireItemViewItem.answers.isNotEmpty()) {
-            questionnaireItemViewItem.clearAnswer()
-          }
-          questionnaireItemViewItem.setDraftAnswer(text.toString())
-          localDate = null
-          enableOrDisableTimePicker(enableIt = false)
         }
-      }
 
       /** Automatically appends date separator (e.g. "/") during date input. */
       inner class DatePatternTextWatcher(private val datePatternSeparator: Char) : TextWatcher {
@@ -400,7 +287,8 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
             datePatternSeparator,
             isDeleting
           )
-          updateAnswerAfterTextChanged(editable.toString())
+          // Always set the draft answer because time is not input yet
+          questionnaireItemViewItem.setDraftAnswer(editable.toString())
         }
       }
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt
index 0dbadd7fb6..986a46f144 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt
@@ -96,7 +96,7 @@ data class QuestionnaireItemViewItem(
   val answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent> =
     questionnaireResponseItem.answer.map { it.copy() }
 
-  /** Updates the answers. This will override any existing answers. */
+  /** Updates the answers. This will override any existing answers and removes the draft answer. */
   fun setAnswer(
     vararg questionnaireResponseItemAnswerComponent:
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
@@ -112,12 +112,12 @@ data class QuestionnaireItemViewItem(
     )
   }
 
-  /** Clears existing answers. */
+  /** Clears existing answers and any draft answer. */
   fun clearAnswer() {
     answersChangedCallback(questionnaireItem, questionnaireResponseItem, listOf(), null)
   }
 
-  /** Adds an answer to the existing answers. */
+  /** Adds an answer to the existing answers and removes the draft answer. */
   internal fun addAnswer(
     questionnaireResponseItemAnswerComponent:
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
@@ -133,7 +133,7 @@ data class QuestionnaireItemViewItem(
     )
   }
 
-  /** Removes an answer from the existing answers. */
+  /** Removes an answer from the existing answers, as well as any draft answer. */
   internal fun removeAnswer(
     questionnaireResponseItemAnswerComponent:
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
@@ -224,7 +224,8 @@ data class QuestionnaireItemViewItem(
             otherAnswer.value != null &&
             answer.value.equalsShallow(otherAnswer.value)
         }
-        .all { it }
+        .all { it } &&
+      draftAnswer == other.draftAnswer
 
   /**
    * Returns whether this [QuestionnaireItemViewItem] and the `other` [QuestionnaireItemViewItem]
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
index 08960e808c..fc0de94c58 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
@@ -100,7 +100,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
 
   @Test
   fun `parse date text input in US locale`() {
-    var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
+    var draftAnswer: Any? = null
     val itemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
@@ -110,22 +110,18 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
               .setValue(DateTimeType(Date(2020 - 1900, 1, 5, 1, 30, 0)))
           ),
         validationResult = NotValidated,
-        answersChangedCallback = { _, _, result, _ -> answers = result },
+        answersChangedCallback = { _, _, _, result -> draftAnswer = result },
       )
     viewHolder.bind(itemViewItem)
 
     viewHolder.dateInputView.text = "11/19/2020"
-
-    val answer = answers!!.single().value as DateTimeType
-    assertThat(answer.day).isEqualTo(19)
-    assertThat(answer.month).isEqualTo(10)
-    assertThat(answer.year).isEqualTo(2020)
+    assertThat(draftAnswer as String).isEqualTo("11/19/2020")
   }
 
   @Test
   fun `parse date text input in Japan locale`() {
     Locale.setDefault(Locale.JAPAN)
-    var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
+    var draftAnswer: Any? = null
     val itemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
@@ -135,16 +131,13 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
               .setValue(DateTimeType(Date(2020 - 1900, 1, 5, 1, 30, 0)))
           ),
         validationResult = NotValidated,
-        answersChangedCallback = { _, _, result, _ -> answers = result },
+        answersChangedCallback = { _, _, _, result -> draftAnswer = result },
       )
     viewHolder.bind(itemViewItem)
 
     viewHolder.dateInputView.text = "2020/11/19"
 
-    val answer = answers!!.single().value as DateTimeType
-    assertThat(answer.day).isEqualTo(19)
-    assertThat(answer.month).isEqualTo(10)
-    assertThat(answer.year).isEqualTo(2020)
+    assertThat(draftAnswer as String).isEqualTo("2020/11/19")
   }
 
   @Test
@@ -293,34 +286,68 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   }
 
   @Test
-  fun `if date input is invalid then do not enable time text input layout`() {
+  fun `if draft answer input is invalid then do not enable time text input layout`() {
     val itemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = "11/19/"
       )
 
     viewHolder.bind(itemViewItem)
-    viewHolder.dateInputView.text = "11/19/"
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.time_input_layout).isEnabled)
       .isFalse()
   }
 
   @Test
-  fun `if date input is valid then enable time text input layout`() {
+  fun `if the draft answer input is empty, do not enable the time text input layout`() {
     val itemViewItem =
       QuestionnaireItemViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = ""
+      )
+
+    viewHolder.bind(itemViewItem)
+
+    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.time_input_layout).isEnabled)
+      .isFalse()
+  }
+
+  @Test
+  fun `if there is no answer or draft answer, do not enable the time text input layout`() {
+    val itemViewItem =
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = null
+      )
+
+    viewHolder.bind(itemViewItem)
+
+    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.time_input_layout).isEnabled)
+      .isFalse()
+  }
+
+  @Test
+  fun `if date draft answer is valid then enable time text input layout`() {
+    val itemViewItem =
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = "11/19/2020"
       )
 
     viewHolder.bind(itemViewItem)
-    viewHolder.dateInputView.text = "11/19/2020"
 
     assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.time_input_layout).isEnabled)
       .isTrue()
@@ -372,6 +399,23 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
       .isNull()
   }
 
+  @Test
+  fun `if the draft answer is invalid, display the error message`() {
+    val itemViewItem =
+      QuestionnaireItemViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+        draftAnswer = "11/19/202"
+      )
+
+    viewHolder.bind(itemViewItem)
+
+    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.date_input_layout).error)
+      .isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
+  }
+
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(

From b80747ac5b9295ff710ad017999c2f895a72b2a8 Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Wed, 22 Feb 2023 20:02:16 +0000
Subject: [PATCH 2/6] Create nested items correctly (#1881)

* Create nested items correctly

* Revert incorrect questionnaire change

* Update MoreQuestionnaireItemComponents.kt

* Re-enable test case

* Update nit

* Update doc for zipByLinkId

* Update datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt

Co-authored-by: Omar Ismail <44980219+omarismail94@users.noreply.github.com>

* Update doc in QuestionnaireViewModel

* Add another level to the test for nested items

---------

Co-authored-by: Omar Ismail <44980219+omarismail94@users.noreply.github.com>
---
 .../MoreQuestionnaireItemComponents.kt        |  63 +++---
 ...oreQuestionnairesResponseItemComponents.kt |  14 ++
 .../datacapture/QuestionnaireViewModel.kt     | 132 +++++++-----
 .../ValueConstraintExtensionValidator.kt      |   2 +-
 ...QuestionnaireItemGroupViewHolderFactory.kt |   2 +
 .../datacapture/QuestionnaireViewModelTest.kt | 190 +++++-------------
 6 files changed, 178 insertions(+), 225 deletions(-)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
index 14a10aef0c..199129a514 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
@@ -284,14 +284,6 @@ internal val Questionnaire.QuestionnaireItemComponent.isHelpCode: Boolean
       }
     }
   }
-
-/**
- * Whether the corresponding [QuestionnaireResponse.QuestionnaireResponseItemComponent] should have
- * nested items within [QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent](s).
- */
-internal val Questionnaire.QuestionnaireItemComponent.hasNestedItemsWithinAnswers: Boolean
-  get() = item.isNotEmpty() && type != Questionnaire.QuestionnaireItemType.GROUP
-
 /** Converts Text with HTML Tag to formated text. */
 private fun String.toSpanned(): Spanned {
   return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_COMPACT)
@@ -424,6 +416,33 @@ internal val Questionnaire.QuestionnaireItemComponent.sliderStepValue: Int?
     return null
   }
 
+/**
+ * Whether the corresponding [QuestionnaireResponse.QuestionnaireResponseItemComponent] should have
+ * [QuestionnaireResponse.QuestionnaireResponseItemComponent]s nested under
+ * [QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent]s.
+ *
+ * This is true for the following two cases:
+ * 1. Questions with nested items
+ * 2. Repeated groups with nested items (Note that this is how repeated groups are organized in the
+ * [QuestionnaireViewModel], and that they will be flattened in the final [QuestionnaireResponse].)
+ *
+ * Non-repeated groups should have child items nested directly under the group itself.
+ *
+ * For background, see https://build.fhir.org/questionnaireresponse.html#link.
+ */
+internal val Questionnaire.QuestionnaireItemComponent.shouldHaveNestedItemsUnderAnswers: Boolean
+  get() = item.isNotEmpty() && (type != Questionnaire.QuestionnaireItemType.GROUP || !repeats)
+
+/**
+ * Creates a list of [QuestionnaireResponse.QuestionnaireResponseItemComponent]s from the nested
+ * items in the [Questionnaire.QuestionnaireItemComponent].
+ *
+ * The hierarchy and order of child items will be retained as specified in the standard. See
+ * https://www.hl7.org/fhir/questionnaireresponse.html#notes for more details.
+ */
+fun Questionnaire.QuestionnaireItemComponent.getNestedQuestionnaireResponseItems() =
+  item.map { it.createQuestionnaireResponseItem() }
+
 /**
  * Creates a [QuestionnaireResponse.QuestionnaireResponseItemComponent] from the provided
  * [Questionnaire.QuestionnaireItemComponent].
@@ -436,10 +455,10 @@ fun Questionnaire.QuestionnaireItemComponent.createQuestionnaireResponseItem():
   return QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
     linkId = this@createQuestionnaireResponseItem.linkId
     answer = createQuestionnaireResponseItemAnswers()
-    if (hasNestedItemsWithinAnswers && answer.isNotEmpty()) {
+    if (shouldHaveNestedItemsUnderAnswers && answer.isNotEmpty()) {
       this.addNestedItemsToAnswer(this@createQuestionnaireResponseItem)
     } else if (this@createQuestionnaireResponseItem.type ==
-        Questionnaire.QuestionnaireItemType.GROUP
+        Questionnaire.QuestionnaireItemType.GROUP && !repeats
     ) {
       this@createQuestionnaireResponseItem.item.forEach {
         this.addItem(it.createQuestionnaireResponseItem())
@@ -492,20 +511,6 @@ private fun Questionnaire.QuestionnaireItemComponent.createQuestionnaireResponse
   )
 }
 
-/**
- * Add items within [QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent] from the
- * provided parent [Questionnaire.QuestionnaireItemComponent] with nested items. The hierarchy and
- * order of child items will be retained as specified in the standard. See
- * https://www.hl7.org/fhir/questionnaireresponse.html#notes for more details.
- */
-fun QuestionnaireResponse.QuestionnaireResponseItemComponent.addNestedItemsToAnswer(
-  questionnaireItemComponent: Questionnaire.QuestionnaireItemComponent
-) {
-  if (answer.isNotEmpty()) {
-    answer.first().item = questionnaireItemComponent.getNestedQuestionnaireResponseItems()
-  }
-}
-
 internal val Questionnaire.QuestionnaireItemComponent.answerExpression: Expression?
   get() =
     ToolingExtensions.getExtension(this, EXTENSION_ANSWER_EXPRESSION_URL)?.value?.let {
@@ -599,16 +604,6 @@ fun List<Questionnaire.QuestionnaireItemComponent>.flattened():
   return this + this.flatMap { it.item.flattened() }
 }
 
-/**
- * Creates a list of [QuestionnaireResponse.QuestionnaireResponseItemComponent]s from the nested
- * items in the [Questionnaire.QuestionnaireItemComponent].
- *
- * The hierarchy and order of child items will be retained as specified in the standard. See
- * https://www.hl7.org/fhir/questionnaireresponse.html#notes for more details.
- */
-fun Questionnaire.QuestionnaireItemComponent.getNestedQuestionnaireResponseItems() =
-  item.map { it.createQuestionnaireResponseItem() }
-
 val Resource.logicalId: String
   get() {
     return this.idElement?.idPart.orEmpty()
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt
index 7c512e8a82..0d51a9933b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt
@@ -16,6 +16,7 @@
 
 package com.google.android.fhir.datacapture
 
+import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
 /**
@@ -28,3 +29,16 @@ val QuestionnaireResponse.QuestionnaireResponseItemComponent.descendant:
       this.item.flatMap { it.descendant } +
       this.answer.flatMap { answer -> answer.item.flatMap { it.descendant } }
   }
+
+/**
+ * Add nested items under the provided `questionnaireItem` to each answer in the questionnaire
+ * response item. The hierarchy and order of nested items will be retained as specified in the
+ * standard.
+ *
+ * See https://www.hl7.org/fhir/questionnaireresponse.html#notes for more details.
+ */
+fun QuestionnaireResponse.QuestionnaireResponseItemComponent.addNestedItemsToAnswer(
+  questionnaireItem: Questionnaire.QuestionnaireItemComponent
+) {
+  answer.forEach { it.item = questionnaireItem.getNestedQuestionnaireResponseItems() }
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index cbbe2ae61a..c59c7ebe43 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -46,6 +46,7 @@ import kotlinx.coroutines.flow.update
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
 import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent
@@ -89,9 +90,6 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       }
   }
 
-  @VisibleForTesting
-  val entryMode: EntryMode by lazy { questionnaire.entryMode ?: EntryMode.RANDOM }
-
   /** The current questionnaire response as questions are being answered. */
   private val questionnaireResponse: QuestionnaireResponse
 
@@ -133,12 +131,12 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
 
   /** The map from each item in the [Questionnaire] to its parent. */
   private var questionnaireItemParentMap:
-    Map<Questionnaire.QuestionnaireItemComponent, Questionnaire.QuestionnaireItemComponent>
+    Map<QuestionnaireItemComponent, QuestionnaireItemComponent>
 
   init {
     /** Adds each child-parent pair in the [Questionnaire] to the parent map. */
     fun buildParentList(
-      item: Questionnaire.QuestionnaireItemComponent,
+      item: QuestionnaireItemComponent,
       questionnaireItemToParentMap: ItemToParentMap,
     ) {
       for (child in item.item) {
@@ -154,6 +152,9 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
     }
   }
 
+  @VisibleForTesting
+  val entryMode: EntryMode by lazy { questionnaire.entryMode ?: EntryMode.RANDOM }
+
   /** Flag to determine if the questionnaire should be read-only. */
   private val isReadOnly = state[QuestionnaireFragment.EXTRA_READ_ONLY] ?: false
 
@@ -244,7 +245,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    */
   private val answersChangedCallback:
     (
-      Questionnaire.QuestionnaireItemComponent,
+      QuestionnaireItemComponent,
       QuestionnaireResponseItemComponent,
       List<QuestionnaireResponseItemAnswerComponent>,
       Any?
@@ -264,7 +265,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
           }
         }
       }
-      if (questionnaireItem.hasNestedItemsWithinAnswers) {
+      if (questionnaireItem.shouldHaveNestedItemsUnderAnswers) {
         questionnaireResponseItem.addNestedItemsToAnswer(questionnaireItem)
       }
       modifiedQuestionnaireResponseItemSet.add(questionnaireResponseItem)
@@ -390,7 +391,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       )
 
   private fun updateDependentQuestionnaireResponseItems(
-    updatedQuestionnaireItem: Questionnaire.QuestionnaireItemComponent,
+    updatedQuestionnaireItem: QuestionnaireItemComponent,
   ) {
     evaluateCalculatedExpressions(
         updatedQuestionnaireItem,
@@ -464,7 +465,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   // https://build.fhir.org/ig/HL7/sdc/expressions.html#x-fhir-query-enhancements
   @PublishedApi
   internal suspend fun resolveAnswerExpression(
-    item: Questionnaire.QuestionnaireItemComponent,
+    item: QuestionnaireItemComponent,
   ): List<Questionnaire.QuestionnaireItemAnswerOptionComponent> {
     // Check cache first for database queries
     val answerExpression = item.answerExpression ?: return emptyList()
@@ -481,7 +482,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   }
 
   private suspend fun loadAnswerExpressionOptions(
-    item: Questionnaire.QuestionnaireItemComponent,
+    item: QuestionnaireItemComponent,
     expression: Expression,
   ): List<Questionnaire.QuestionnaireItemAnswerOptionComponent> {
     val data =
@@ -573,26 +574,14 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * questionnaire response items.
    */
   private fun getQuestionnaireAdapterItems(
-    questionnaireItemList: List<Questionnaire.QuestionnaireItemComponent>,
+    questionnaireItemList: List<QuestionnaireItemComponent>,
     questionnaireResponseItemList: List<QuestionnaireResponseItemComponent>,
   ): List<QuestionnaireAdapterItem> {
-    var responseIndex = 0
     return questionnaireItemList
-      .asSequence()
-      .flatMap { questionnaireItem ->
-        var questionnaireResponseItem = questionnaireItem.createQuestionnaireResponseItem()
-        // If there is an enabled questionnaire response available then we use that. Or else we
-        // just use an empty questionnaireResponse Item
-        if (responseIndex < questionnaireResponseItemList.size &&
-            questionnaireItem.linkId == questionnaireResponseItemList[responseIndex].linkId
-        ) {
-          questionnaireResponseItem = questionnaireResponseItemList[responseIndex]
-          responseIndex += 1
-        }
-
+      .zipByLinkId(questionnaireResponseItemList) { questionnaireItem, questionnaireResponseItem ->
         getQuestionnaireAdapterItems(questionnaireItem, questionnaireResponseItem)
       }
-      .toList()
+      .flatten()
   }
 
   /**
@@ -600,7 +589,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * questionnaire response item.
    */
   private fun getQuestionnaireAdapterItems(
-    questionnaireItem: Questionnaire.QuestionnaireItemComponent,
+    questionnaireItem: QuestionnaireItemComponent,
     questionnaireResponseItem: QuestionnaireResponseItemComponent,
   ): List<QuestionnaireAdapterItem> {
     // Hidden questions should not get QuestionnaireItemViewItem instances
@@ -630,31 +619,42 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       } else {
         NotValidated
       }
-    val items =
-      buildList<QuestionnaireAdapterItem> {
-        // Add an item for the question itself
-        add(
-          QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
-              questionnaireItem,
-              questionnaireResponseItem,
-              validationResult = validationResult,
-              answersChangedCallback = answersChangedCallback,
-              resolveAnswerValueSet = { resolveAnswerValueSet(it) },
-              resolveAnswerExpression = { resolveAnswerExpression(it) },
-              draftAnswer = draftAnswerMap[questionnaireResponseItem]
-            )
+    val items = buildList {
+      // Add an item for the question itself
+      add(
+        QuestionnaireAdapterItem.Question(
+          QuestionnaireItemViewItem(
+            questionnaireItem,
+            questionnaireResponseItem,
+            validationResult = validationResult,
+            answersChangedCallback = answersChangedCallback,
+            resolveAnswerValueSet = { resolveAnswerValueSet(it) },
+            resolveAnswerExpression = { resolveAnswerExpression(it) },
+            draftAnswer = draftAnswerMap[questionnaireResponseItem]
           )
         )
-        val nestedResponses: List<List<QuestionnaireResponseItemComponent>> =
-          when {
-            // Repeated questions have one answer item per response instance, which we must display
-            // after the question.
-            questionnaireItem.repeats -> questionnaireResponseItem.answer.map { it.item }
-            // Non-repeated questions may have nested items, which we should display
-            else -> listOf(questionnaireResponseItem.item)
-          }
-        nestedResponses.forEach { nestedResponse ->
+      )
+
+      // Add nested questions after the parent item. We need to get the questionnaire items and
+      // (possibly multiple sets of) matching questionnaire response items and generate the adapter
+      // items. There are three different cases:
+      // 1. Questions nested under a non-repeated group: Simply take the nested question items and
+      // the nested question response items and "zip" them.
+      // 2. Questions nested under a question: In this case, the nested questions are repeated for
+      // each answer to the parent question. Therefore, we need to take the questions and lists of
+      // questionnaire response items nested under each answer and generate multiple sets of adapter
+      // items.
+      // 3. Questions nested under a repeated group: In the in-memory questionnaire response in the
+      // view model, we create dummy answers for each repeated group. As a result the processing of
+      // this case is similar to the case of questions nested under a question.
+      // For background, see https://build.fhir.org/questionnaireresponse.html#link.
+      buildList {
+          // Case 1
+          add(questionnaireResponseItem.item)
+          // Case 2 and 3
+          addAll(questionnaireResponseItem.answer.map { it.item })
+        }
+        .forEach { nestedResponseItemList ->
           addAll(
             getQuestionnaireAdapterItems(
               // If nested display item is identified as instructions or flyover, then do not create
@@ -664,11 +664,11 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
                   it.type == Questionnaire.QuestionnaireItemType.DISPLAY &&
                     (it.isInstructionsCode || it.isFlyoverCode || it.isHelpCode)
                 },
-              questionnaireResponseItemList = nestedResponse,
+              questionnaireResponseItemList = nestedResponseItemList,
             )
           )
         }
-      }
+    }
     currentPageItems = items
     return items
   }
@@ -701,7 +701,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   }
 
   private fun getEnabledResponseItems(
-    questionnaireItemList: List<Questionnaire.QuestionnaireItemComponent>,
+    questionnaireItemList: List<QuestionnaireItemComponent>,
     questionnaireResponseItemList: List<QuestionnaireResponseItemComponent>,
   ): List<QuestionnaireResponseItemComponent> {
     val enablementEvaluator = EnablementEvaluator(questionnaireResponse)
@@ -749,7 +749,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
    * individual questions within this particular group instance).
    */
   private fun createRepeatedGroupResponse(
-    questionnaireItem: Questionnaire.QuestionnaireItemComponent,
+    questionnaireItem: QuestionnaireItemComponent,
     questionnaireResponseItem: QuestionnaireResponseItemComponent,
   ): List<QuestionnaireResponseItemComponent> {
     val individualQuestions = questionnaireItem.item
@@ -795,8 +795,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
     }
 }
 
-typealias ItemToParentMap =
-  MutableMap<Questionnaire.QuestionnaireItemComponent, Questionnaire.QuestionnaireItemComponent>
+typealias ItemToParentMap = MutableMap<QuestionnaireItemComponent, QuestionnaireItemComponent>
 
 /** Questionnaire state for the Fragment to consume. */
 internal data class QuestionnaireState(
@@ -833,3 +832,26 @@ internal val QuestionnairePagination.hasPreviousPage: Boolean
 
 internal val QuestionnairePagination.hasNextPage: Boolean
   get() = pages.any { it.index > currentPageIndex && it.enabled }
+
+/**
+ * Returns a list of values built from the elements of `this` and the
+ * `questionnaireResponseItemList` with the same linkId using the provided `transform` function
+ * applied to each pair of questionnaire item and questionnaire response item.
+ *
+ * It is assumed that the linkIds are unique in `this` and in `questionnaireResponseItemList`.
+ *
+ * Although linkIds may appear more than once in questionnaire response, they would not appear more
+ * than once within a list of questionnaire response items sharing the same parent.
+ */
+private inline fun <T> List<QuestionnaireItemComponent>.zipByLinkId(
+  questionnaireResponseItemList: List<QuestionnaireResponseItemComponent>,
+  transform: (QuestionnaireItemComponent, QuestionnaireResponseItemComponent) -> T
+): List<T> {
+  val linkIdToQuestionnaireResponseItemMap = questionnaireResponseItemList.associateBy { it.linkId }
+  return mapNotNull { questionnaireItem ->
+    linkIdToQuestionnaireResponseItemMap[questionnaireItem.linkId]?.let { questionnaireResponseItem
+      ->
+      transform(questionnaireItem, questionnaireResponseItem)
+    }
+  }
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/ValueConstraintExtensionValidator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/ValueConstraintExtensionValidator.kt
index 3d09052268..459e41c49d 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/ValueConstraintExtensionValidator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/validation/ValueConstraintExtensionValidator.kt
@@ -33,7 +33,7 @@ internal open class ValueConstraintExtensionValidator(
     answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>,
     context: Context
   ): ConstraintValidator.ConstraintValidationResult {
-    if (questionnaireItem.hasExtension(url) && !answers.isEmpty()) {
+    if (questionnaireItem.hasExtension(url) && answers.isNotEmpty()) {
       val extension = questionnaireItem.getExtensionByUrl(url)
       // TODO(https://github.com/google/android-fhir/issues/487): Validates all answers.
       val answer = answers[0]
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt
index b73919ba39..f11353ba50 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt
@@ -49,6 +49,8 @@ internal object QuestionnaireItemGroupViewHolderFactory :
         addItemButton.setOnClickListener {
           questionnaireItemViewItem.addAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              // TODO(jingtang10): This can be removed since we already do this in the
+              // answerChangedCallback in the QuestionnaireViewModel.
               item =
                 questionnaireItemViewItem.questionnaireItem.getNestedQuestionnaireResponseItems()
             }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index 0fd526d370..cfa732c60b 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -70,7 +70,6 @@ import org.hl7.fhir.r4.model.ValueSet
 import org.hl7.fhir.r4.utils.ToolingExtensions
 import org.junit.Assert.assertThrows
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestWatcher
@@ -1341,122 +1340,6 @@ class QuestionnaireViewModelTest {
 
   // Test cases for state flow
 
-  @Test
-  fun stateHasQuestionnaireResponse_lessItemsInQuestionnaireResponse_shouldAddTheMissingItem() =
-    runTest {
-      val questionnaire =
-        Questionnaire().apply {
-          id = "a-questionnaire"
-          addItem(
-            Questionnaire.QuestionnaireItemComponent().apply {
-              linkId = "a-link-id"
-              text = "Basic question"
-              type = Questionnaire.QuestionnaireItemType.BOOLEAN
-              initial = listOf(Questionnaire.QuestionnaireItemInitialComponent(BooleanType(true)))
-            }
-          )
-        }
-      val questionnaireResponse = QuestionnaireResponse().apply { id = "a-questionnaire-response" }
-      val questionnaireResponseWithMissingItem =
-        QuestionnaireResponse().apply {
-          id = "a-questionnaire-response"
-          addItem(
-            QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
-              linkId = "a-link-id"
-              answer =
-                listOf(
-                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                    value = BooleanType(true)
-                  }
-                )
-            }
-          )
-        }
-
-      val questionnaireViewModel =
-        createQuestionnaireViewModel(questionnaire, questionnaireResponse)
-
-      val questionnaireItemViewItem = questionnaireViewModel.questionnaireStateFlow.first()
-      assertThat(questionnaireItemViewItem.items.first().asQuestion().questionnaireItem.linkId)
-        .isEqualTo(questionnaireResponseWithMissingItem.item.first().linkId)
-      assertThat(
-          questionnaireItemViewItem.items
-            .single()
-            .asQuestion()
-            .answers
-            .single()
-            .valueBooleanType.booleanValue()
-        )
-        .isTrue()
-    }
-
-  @Test
-  fun stateHasQuestionnaireResponse_lessItemsInQuestionnaireResponse_shouldCopyAnswer() = runTest {
-    val questionnaire =
-      Questionnaire().apply {
-        id = "a-questionnaire"
-        addItem(
-          Questionnaire.QuestionnaireItemComponent().apply {
-            linkId = "q1"
-            text = "Basic question"
-            type = Questionnaire.QuestionnaireItemType.BOOLEAN
-            initial = listOf(Questionnaire.QuestionnaireItemInitialComponent(BooleanType(false)))
-          }
-        )
-        addItem(
-          Questionnaire.QuestionnaireItemComponent().apply {
-            linkId = "q2"
-            text = "Another basic question"
-            type = Questionnaire.QuestionnaireItemType.BOOLEAN
-            initial = listOf(Questionnaire.QuestionnaireItemInitialComponent(BooleanType(false)))
-          }
-        )
-        addItem(
-          Questionnaire.QuestionnaireItemComponent().apply {
-            linkId = "q3"
-            text = "Another basic question"
-            type = Questionnaire.QuestionnaireItemType.BOOLEAN
-            initial = listOf(Questionnaire.QuestionnaireItemInitialComponent(BooleanType(false)))
-          }
-        )
-      }
-    val questionnaireResponse =
-      QuestionnaireResponse().apply {
-        id = "a-questionnaire-response"
-        addItem(
-          QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
-            linkId = "q2"
-            answer =
-              listOf(
-                QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                  value = BooleanType(true)
-                }
-              )
-          }
-        )
-      }
-
-    val questionnaireViewModel = createQuestionnaireViewModel(questionnaire, questionnaireResponse)
-    val questionnaireItemViewItemList = questionnaireViewModel.questionnaireStateFlow.first().items
-
-    // Answer to first question should be created from questionnaire
-    val questionnaireItemViewItem1 = questionnaireItemViewItemList[0].asQuestion()
-    assertThat(questionnaireItemViewItem1.questionnaireItem.linkId).isEqualTo("q1")
-    assertThat(questionnaireItemViewItem1.answers.single().valueBooleanType.booleanValue())
-      .isFalse()
-
-    // Answer to second question should be copied from questionnaire response
-    val questionnaireItemViewItem2 = questionnaireItemViewItemList[1].asQuestion()
-    assertThat(questionnaireItemViewItem2.questionnaireItem.linkId).isEqualTo("q2")
-    assertThat(questionnaireItemViewItem2.answers.single().valueBooleanType.booleanValue()).isTrue()
-
-    // Answer to third question should be created from questionnaire
-    val questionnaireItemViewItem3 = questionnaireItemViewItemList[2].asQuestion()
-    assertThat(questionnaireItemViewItem3.questionnaireItem.linkId).isEqualTo("q3")
-    assertThat(questionnaireItemViewItem3.answers.single().valueBooleanType.booleanValue())
-      .isFalse()
-  }
-
   @Test
   fun `should emit questionnaire state flow`() = runTest {
     val questionnaire =
@@ -1931,7 +1814,6 @@ class QuestionnaireViewModelTest {
   }
 
   @Test
-  @Ignore("https://github.com/google/android-fhir/issues/487")
   fun questionnaireHasNestedItem_notOfTypeGroup_shouldNestItemWithinAnswerItem() = runTest {
     val questionnaire =
       Questionnaire().apply {
@@ -1946,6 +1828,13 @@ class QuestionnaireViewModelTest {
                 linkId = "a-nested-boolean-item"
                 text = "Nested question"
                 type = Questionnaire.QuestionnaireItemType.BOOLEAN
+                addItem(
+                  Questionnaire.QuestionnaireItemComponent().apply {
+                    linkId = "a-nested-nested-boolean-item"
+                    text = "Nested nested question"
+                    type = Questionnaire.QuestionnaireItemType.BOOLEAN
+                  }
+                )
               }
             )
           }
@@ -1957,15 +1846,27 @@ class QuestionnaireViewModelTest {
         addItem(
           QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
             linkId = "a-boolean-item"
+            text = "Parent question"
             addAnswer(
               QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                 this.value = valueBooleanType.setValue(false)
                 addItem(
                   QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
                     linkId = "a-nested-boolean-item"
+                    text = "Nested question"
                     addAnswer(
                       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                         this.value = valueBooleanType.setValue(false)
+                        addItem(
+                          QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+                            linkId = "a-nested-nested-boolean-item"
+                            text = "Nested nested question"
+                            addAnswer(
+                              QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
+                                .apply { this.value = valueBooleanType.setValue(false) }
+                            )
+                          }
+                        )
                       }
                     )
                   }
@@ -1977,25 +1878,44 @@ class QuestionnaireViewModelTest {
       }
 
     val viewModel = createQuestionnaireViewModel(questionnaire)
+    viewModel.runViewModelBlocking {
+      var items = viewModel.getQuestionnaireItemViewItemList().map { it.asQuestion() }
+      assertThat(items.map { it.questionnaireItem.linkId }).containsExactly("a-boolean-item")
 
-    viewModel
-      .getQuestionnaireItemViewItemList()[0]
-      .asQuestion()
-      .setAnswer(
-        QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-          this.value = valueBooleanType.setValue(false)
-        }
-      )
-    viewModel
-      .getQuestionnaireItemViewItemList()[1]
-      .asQuestion()
-      .setAnswer(
-        QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-          this.value = valueBooleanType.setValue(false)
-        }
-      )
+      items
+        .first()
+        .setAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+            this.value = valueBooleanType.setValue(false)
+          }
+        )
 
-    assertResourceEquals(viewModel.getQuestionnaireResponse(), questionnaireResponse)
+      items = viewModel.getQuestionnaireItemViewItemList().map { it.asQuestion() }
+      assertThat(items.map { it.questionnaireItem.linkId })
+        .containsExactly("a-boolean-item", "a-nested-boolean-item")
+
+      items
+        .last()
+        .setAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+            this.value = valueBooleanType.setValue(false)
+          }
+        )
+
+      items = viewModel.getQuestionnaireItemViewItemList().map { it.asQuestion() }
+      assertThat(items.map { it.questionnaireItem.linkId })
+        .containsExactly("a-boolean-item", "a-nested-boolean-item", "a-nested-nested-boolean-item")
+
+      items
+        .last()
+        .setAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+            this.value = valueBooleanType.setValue(false)
+          }
+        )
+
+      assertResourceEquals(viewModel.getQuestionnaireResponse(), questionnaireResponse)
+    }
   }
 
   // Test cases for pagination and navigation

From 5e57859836e9343384d6eedb9952ea994caaadf9 Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Wed, 22 Feb 2023 20:34:58 +0000
Subject: [PATCH 3/6] Bump up SDC lib version number to 1.0.0 (#1879)

* Bump up SDC lib version number to 1.0.0

* Run spotless apply

---------

Co-authored-by: Omar Ismail <44980219+omarismail94@users.noreply.github.com>
---
 buildSrc/src/main/kotlin/Releases.kt |  4 ++--
 implementationguide/build.gradle.kts | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
index c6da3648f2..20077e2977 100644
--- a/buildSrc/src/main/kotlin/Releases.kt
+++ b/buildSrc/src/main/kotlin/Releases.kt
@@ -54,7 +54,7 @@ object Releases {
 
   object DataCapture : LibraryArtifact {
     override val artifactId = "data-capture"
-    override val version = "0.1.0-beta06"
+    override val version = "1.0.0"
     override val name = "Android FHIR Structured Data Capture Library"
   }
 
@@ -72,7 +72,7 @@ object Releases {
     }
   }
 
-  object ImplmentationGuide : LibraryArtifact {
+  object ImplementationGuide : LibraryArtifact {
     override val artifactId = "implementationguide"
     override val version = "0.1.0-alpha001"
     override val name = "Android FHIR Implementation Guide Library"
diff --git a/implementationguide/build.gradle.kts b/implementationguide/build.gradle.kts
index 67682641a1..011426d455 100644
--- a/implementationguide/build.gradle.kts
+++ b/implementationguide/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
   id(Plugins.BuildPlugins.dokka).version(Plugins.Versions.dokka)
 }
 
-publishArtifact(Releases.ImplmentationGuide)
+publishArtifact(Releases.ImplementationGuide)
 
 createJacocoTestReportTask()
 
@@ -110,13 +110,15 @@ dependencies {
 
 tasks.dokkaHtml.configure {
   outputDirectory.set(
-    file("../docs/${Releases.ImplmentationGuide.artifactId}/${Releases.ImplmentationGuide.version}")
+    file(
+      "../docs/${Releases.ImplementationGuide.artifactId}/${Releases.ImplementationGuide.version}"
+    )
   )
   suppressInheritedMembers.set(true)
   dokkaSourceSets {
     named("main") {
-      moduleName.set(Releases.ImplmentationGuide.artifactId)
-      moduleVersion.set(Releases.ImplmentationGuide.version)
+      moduleName.set(Releases.ImplementationGuide.artifactId)
+      moduleVersion.set(Releases.ImplementationGuide.version)
       noAndroidSdkLink.set(false)
       externalDocumentationLink {
         url.set(URL("https://hapifhir.io/hapi-fhir/apidocs/hapi-fhir-structures-r4/"))

From aafd4512d24ae2332b16a08d64d3621b9813bfb7 Mon Sep 17 00:00:00 2001
From: maimoonak <4829880+maimoonak@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:05:05 -0500
Subject: [PATCH 4/6] Sync state progress update (#1572)

* Sync state progress update

* Update tests | Fix missing states

* Fix feedback | Add tests

* Fix flow with upload

* Fix failing tests

* Fix for flow collect extension

* Use download and uploader statuses instead of progress

* add internal to percentOf function

* add todo to generalize downloader apis

---------

Co-authored-by: Jing Tang <jingtang@google.com>
Co-authored-by: fikrimilano <fikrimilano1@gmail.com>
---
 .../fhir/demo/MainActivityViewModel.kt        |   7 +-
 .../android/fhir/demo/PatientListFragment.kt  |  34 ++-
 .../fhir/demo/data/DownloadWorkManagerImpl.kt |  10 +
 .../main/res/layout/sync_status_layout.xml    |  51 +++-
 demo/src/main/res/values/strings.xml          |   1 +
 .../main/java/com/google/android/fhir/Util.kt |   3 +
 .../com/google/android/fhir/sync/Config.kt    |   2 +
 .../android/fhir/sync/DownloadWorkManager.kt  |   9 +-
 .../google/android/fhir/sync/Downloader.kt    |  10 +-
 .../android/fhir/sync/FhirSynchronizer.kt     |  23 +-
 .../google/android/fhir/sync/SyncJobStatus.kt |   7 +-
 .../com/google/android/fhir/sync/Uploader.kt  |  15 +-
 .../fhir/sync/download/DownloaderImpl.kt      |  34 ++-
 .../ResourceParamsBasedDownloadWorkManager.kt |  59 ++++-
 .../fhir/sync/remote/RemoteFhirService.kt     |   3 +-
 .../fhir/sync/upload/BundleUploader.kt        |  27 +-
 .../android/fhir/resource/TestingUtils.kt     |  34 ++-
 .../java/com/google/android/fhir/UtilTest.kt  |  10 +
 .../fhir/sync/download/DownloaderImplTest.kt  | 241 ++++++++++++------
 ...ourceParamsBasedDownloadWorkManagerTest.kt | 150 ++++++-----
 .../fhir/sync/upload/BundleUploaderTest.kt    |  31 ++-
 21 files changed, 543 insertions(+), 218 deletions(-)

diff --git a/demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt b/demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt
index 1ebf6cdc9b..d5c27b91e6 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/MainActivityViewModel.kt
@@ -33,6 +33,8 @@ import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
 
 /** View model for [MainActivity]. */
@@ -55,13 +57,16 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
             repeat = RepeatInterval(interval = 15, timeUnit = TimeUnit.MINUTES)
           )
         )
+        .shareIn(this, SharingStarted.Eagerly, 10)
         .collect { _pollState.emit(it) }
     }
   }
 
   fun triggerOneTimeSync() {
     viewModelScope.launch {
-      Sync.oneTimeSync<FhirSyncWorker>(getApplication()).collect { _pollState.emit(it) }
+      Sync.oneTimeSync<FhirSyncWorker>(getApplication())
+        .shareIn(this, SharingStarted.Eagerly, 10)
+        .collect { _pollState.emit(it) }
     }
   }
 
diff --git a/demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt b/demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt
index 3550a2aa74..b629323b6c 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/PatientListFragment.kt
@@ -29,6 +29,7 @@ import android.view.ViewGroup
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.LinearLayout
+import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
@@ -44,6 +45,7 @@ import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.demo.PatientListViewModel.PatientListViewModelFactory
 import com.google.android.fhir.demo.databinding.FragmentPatientListBinding
 import com.google.android.fhir.sync.SyncJobStatus
+import kotlin.math.roundToInt
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -53,6 +55,8 @@ class PatientListFragment : Fragment() {
   private lateinit var searchView: SearchView
   private lateinit var topBanner: LinearLayout
   private lateinit var syncStatus: TextView
+  private lateinit var syncPercent: TextView
+  private lateinit var syncProgress: ProgressBar
   private var _binding: FragmentPatientListBinding? = null
   private val binding
     get() = _binding!!
@@ -101,6 +105,8 @@ class PatientListFragment : Fragment() {
     searchView = binding.search
     topBanner = binding.syncStatusContainer.linearLayoutSyncStatus
     syncStatus = binding.syncStatusContainer.tvSyncingStatus
+    syncPercent = binding.syncStatusContainer.tvSyncingPercent
+    syncProgress = binding.syncStatusContainer.progressSyncing
     searchView.setOnQueryTextListener(
       object : SearchView.OnQueryTextListener {
         override fun onQueryTextChange(newText: String): Boolean {
@@ -149,11 +155,11 @@ class PatientListFragment : Fragment() {
         when (it) {
           is SyncJobStatus.Started -> {
             Timber.i("Sync: ${it::class.java.simpleName}")
-            fadeInTopBanner()
+            fadeInTopBanner(it)
           }
           is SyncJobStatus.InProgress -> {
-            Timber.i("Sync: ${it::class.java.simpleName} with ${it.resourceType?.name}")
-            fadeInTopBanner()
+            Timber.i("Sync: ${it::class.java.simpleName} with data $it")
+            fadeInTopBanner(it)
           }
           is SyncJobStatus.Finished -> {
             Timber.i("Sync: ${it::class.java.simpleName} at ${it.timestamp}")
@@ -205,18 +211,36 @@ class PatientListFragment : Fragment() {
       .navigate(PatientListFragmentDirections.actionPatientListToAddPatientFragment())
   }
 
-  private fun fadeInTopBanner() {
+  private fun fadeInTopBanner(state: SyncJobStatus) {
     if (topBanner.visibility != View.VISIBLE) {
       syncStatus.text = resources.getString(R.string.syncing).uppercase()
+      syncPercent.text = ""
+      syncProgress.progress = 0
+      syncProgress.visibility = View.VISIBLE
       topBanner.visibility = View.VISIBLE
       val animation = AnimationUtils.loadAnimation(topBanner.context, R.anim.fade_in)
       topBanner.startAnimation(animation)
+    } else if (state is SyncJobStatus.InProgress) {
+      val progress =
+        state
+          .let { it.completed.toDouble().div(it.total) }
+          .let { if (it.isNaN()) 0.0 else it }
+          .times(100)
+          .roundToInt()
+      "$progress% ${state.syncOperation.name.lowercase()}ed".also { syncPercent.text = it }
+      syncProgress.progress = progress
     }
   }
 
   private fun fadeOutTopBanner(state: SyncJobStatus) {
+    if (state is SyncJobStatus.Finished) syncPercent.text = ""
+    syncProgress.visibility = View.GONE
+
     if (topBanner.visibility == View.VISIBLE) {
-      syncStatus.text = state::class.java.simpleName.uppercase()
+      "${resources.getString(R.string.sync).uppercase()} ${state::class.java.simpleName.uppercase()}".also {
+        syncStatus.text = it
+      }
+
       val animation = AnimationUtils.loadAnimation(topBanner.context, R.anim.fade_out)
       topBanner.startAnimation(animation)
       Handler(Looper.getMainLooper()).postDelayed({ topBanner.visibility = View.GONE }, 2000)
diff --git a/demo/src/main/java/com/google/android/fhir/demo/data/DownloadWorkManagerImpl.kt b/demo/src/main/java/com/google/android/fhir/demo/data/DownloadWorkManagerImpl.kt
index c9165b5584..0490557c7e 100644
--- a/demo/src/main/java/com/google/android/fhir/demo/data/DownloadWorkManagerImpl.kt
+++ b/demo/src/main/java/com/google/android/fhir/demo/data/DownloadWorkManagerImpl.kt
@@ -18,6 +18,7 @@ package com.google.android.fhir.demo.data
 
 import com.google.android.fhir.SyncDownloadContext
 import com.google.android.fhir.sync.DownloadWorkManager
+import com.google.android.fhir.sync.SyncDataParams
 import java.util.LinkedList
 import org.hl7.fhir.exceptions.FHIRException
 import org.hl7.fhir.r4.model.Bundle
@@ -43,6 +44,15 @@ class DownloadWorkManagerImpl : DownloadWorkManager {
     return url
   }
 
+  override suspend fun getSummaryRequestUrls(
+    context: SyncDownloadContext
+  ): Map<ResourceType, String> {
+    return urls.associate {
+      ResourceType.fromCode(it.substringBefore("?")) to
+        it.plus("&${SyncDataParams.SUMMARY_KEY}=${SyncDataParams.SUMMARY_COUNT_VALUE}")
+    }
+  }
+
   override suspend fun processResponse(response: Resource): Collection<Resource> {
     // As per FHIR documentation :
     // If the search fails (cannot be executed, not that there are no matches), the
diff --git a/demo/src/main/res/layout/sync_status_layout.xml b/demo/src/main/res/layout/sync_status_layout.xml
index 9dec03fd8e..c9c40823f4 100644
--- a/demo/src/main/res/layout/sync_status_layout.xml
+++ b/demo/src/main/res/layout/sync_status_layout.xml
@@ -1,32 +1,57 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linearLayoutSyncStatus"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/text_margin"
     android:layout_marginBottom="@dimen/text_margin"
-    android:background="@color/syncing_background"
     android:clickable="true"
     android:gravity="center"
     android:orientation="vertical"
     android:elevation="@dimen/status_margin"
-    android:visibility="gone"
 >
-
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/syncing_background"
+        android:gravity="center_horizontal"
+    >
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_baseline_sync_24"
+        />
+    <TextView
+            android:id="@+id/tvSyncingStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="@string/syncing"
+            android:textColor="?attr/colorControlNormal"
+            android:textSize="16sp"
+            android:textAlignment="center"
+        />
+    </LinearLayout>
     <TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/tvSyncingStatus"
+        android:id="@+id/tvSyncingPercent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/syncing_background"
-        android:drawableLeft="@drawable/ic_baseline_sync_24"
-        android:drawablePadding="@dimen/status_margin"
-        android:gravity="center"
-        android:layout_marginTop="@dimen/small_text_margin"
-        android:layout_marginBottom="@dimen/small_text_margin"
-        android:text="@string/syncing"
-        android:textColor="?attr/colorControlNormal"
+        android:text="0 %"
+        android:textColor="?attr/colorPrimary"
         android:textSize="16sp"
+        android:layout_gravity="start"
+        android:paddingStart="10dp"
+        android:paddingTop="5dp"
+        tools:ignore="RtlSymmetry"
+    />
+    <ProgressBar
+        android:id="@+id/progressSyncing"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
     />
 </LinearLayout>
diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml
index 46fd993148..3a439cf024 100644
--- a/demo/src/main/res/values/strings.xml
+++ b/demo/src/main/res/values/strings.xml
@@ -67,4 +67,5 @@
   <string name="sync_menu">Sync</string>
   <string name="last_sync">Last sync</string>
   <string name="syncing">Syncing</string>
+  <string name="sync">Sync</string>
 </resources>
diff --git a/engine/src/main/java/com/google/android/fhir/Util.kt b/engine/src/main/java/com/google/android/fhir/Util.kt
index 007e74cc38..5c9dc0f69f 100644
--- a/engine/src/main/java/com/google/android/fhir/Util.kt
+++ b/engine/src/main/java/com/google/android/fhir/Util.kt
@@ -79,3 +79,6 @@ class OffsetDateTimeTypeAdapter : TypeAdapter<OffsetDateTime>() {
 
 /** Url for the UCUM system of measures. */
 const val ucumUrl = "http://unitsofmeasure.org"
+
+internal fun percentOf(value: Number, total: Number) =
+  if (total == 0) 0.0 else value.toDouble() / total.toDouble()
diff --git a/engine/src/main/java/com/google/android/fhir/sync/Config.kt b/engine/src/main/java/com/google/android/fhir/sync/Config.kt
index 1cbb2ee201..fbc3282b14 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/Config.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/Config.kt
@@ -44,6 +44,8 @@ object SyncDataParams {
   const val SORT_KEY = "_sort"
   const val LAST_UPDATED_KEY = "_lastUpdated"
   const val ADDRESS_COUNTRY_KEY = "address-country"
+  const val SUMMARY_KEY = "_summary"
+  const val SUMMARY_COUNT_VALUE = "count"
 }
 
 /** Configuration for period synchronisation */
diff --git a/engine/src/main/java/com/google/android/fhir/sync/DownloadWorkManager.kt b/engine/src/main/java/com/google/android/fhir/sync/DownloadWorkManager.kt
index 994f99fc9d..202193d055 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/DownloadWorkManager.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/DownloadWorkManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.google.android.fhir.sync
 
 import com.google.android.fhir.SyncDownloadContext
 import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 
 /**
  * Manager that generates the FHIR requests and handles the FHIR responses of a download job.
@@ -32,6 +33,12 @@ interface DownloadWorkManager {
    */
   suspend fun getNextRequestUrl(context: SyncDownloadContext): String?
 
+  /* TODO: Generalize the DownloadWorkManager API to not sequentially download resource by type (https://github.com/google/android-fhir/issues/1884) */
+  /**
+   * Returns the map of resourceType and URL for summary of total count for each download request
+   */
+  suspend fun getSummaryRequestUrls(context: SyncDownloadContext): Map<ResourceType, String>
+
   /**
    * Processes the download response and returns the resources to be saved to the local database.
    */
diff --git a/engine/src/main/java/com/google/android/fhir/sync/Downloader.kt b/engine/src/main/java/com/google/android/fhir/sync/Downloader.kt
index b0cde096c8..6aaa172066 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/Downloader.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/Downloader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,16 +25,18 @@ import org.hl7.fhir.r4.model.ResourceType
 internal interface Downloader {
   /**
    * @return Flow of the [DownloadState] which keeps emitting [Resource]s or Error based on the
-   * response of each page download request.
+   * response of each page download request. It also updates progress if [ProgressCallback] exists
    */
   suspend fun download(context: SyncDownloadContext): Flow<DownloadState>
 }
 
+/* TODO: Generalize the Downloader API to not sequentially download resource by type (https://github.com/google/android-fhir/issues/1884) */
 internal sealed class DownloadState {
 
-  data class Started(val type: ResourceType) : DownloadState()
+  data class Started(val type: ResourceType, val total: Int) : DownloadState()
 
-  data class Success(val resources: List<Resource>) : DownloadState()
+  data class Success(val resources: List<Resource>, val total: Int, val completed: Int) :
+    DownloadState()
 
   data class Failure(val syncError: ResourceSyncException) : DownloadState()
 }
diff --git a/engine/src/main/java/com/google/android/fhir/sync/FhirSynchronizer.kt b/engine/src/main/java/com/google/android/fhir/sync/FhirSynchronizer.kt
index 17e5092a36..094b698ef3 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/FhirSynchronizer.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/FhirSynchronizer.kt
@@ -25,6 +25,11 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
 import org.hl7.fhir.r4.model.ResourceType
 
+enum class SyncOperation {
+  DOWNLOAD,
+  UPLOAD
+}
+
 private sealed class SyncResult {
   val timestamp: OffsetDateTime = OffsetDateTime.now()
 
@@ -97,9 +102,10 @@ internal class FhirSynchronizer(
         downloader.download(it).collect {
           when (it) {
             is DownloadState.Started -> {
-              setSyncState(SyncJobStatus.InProgress(it.type))
+              setSyncState(SyncJobStatus.InProgress(SyncOperation.DOWNLOAD, it.total))
             }
             is DownloadState.Success -> {
+              setSyncState(SyncJobStatus.InProgress(SyncOperation.DOWNLOAD, it.total, it.completed))
               emit(it.resources)
             }
             is DownloadState.Failure -> {
@@ -121,10 +127,17 @@ internal class FhirSynchronizer(
     val exceptions = mutableListOf<ResourceSyncException>()
     fhirEngine.syncUpload { list ->
       flow {
-        uploader.upload(list).collect {
-          when (it) {
-            is UploadResult.Success -> emit(it.localChangeToken to it.resource)
-            is UploadResult.Failure -> exceptions.add(it.syncError)
+        uploader.upload(list).collect { result ->
+          when (result) {
+            is UploadResult.Started ->
+              setSyncState(SyncJobStatus.InProgress(SyncOperation.UPLOAD, result.total))
+            is UploadResult.Success ->
+              emit(result.localChangeToken to result.resource).also {
+                setSyncState(
+                  SyncJobStatus.InProgress(SyncOperation.UPLOAD, result.total, result.completed)
+                )
+              }
+            is UploadResult.Failure -> exceptions.add(result.syncError)
           }
         }
       }
diff --git a/engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt b/engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt
index 30b68fadd1..647dae7ec0 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/SyncJobStatus.kt
@@ -17,7 +17,6 @@
 package com.google.android.fhir.sync
 
 import java.time.OffsetDateTime
-import org.hl7.fhir.r4.model.ResourceType
 
 sealed class SyncJobStatus {
   val timestamp: OffsetDateTime = OffsetDateTime.now()
@@ -26,7 +25,11 @@ sealed class SyncJobStatus {
   class Started : SyncJobStatus()
 
   /** Syncing in progress with the server. */
-  data class InProgress(val resourceType: ResourceType?) : SyncJobStatus()
+  data class InProgress(
+    val syncOperation: SyncOperation,
+    val total: Int = 0,
+    val completed: Int = 0
+  ) : SyncJobStatus()
 
   /** Glitched but sync job is being retried. */
   data class Glitch(val exceptions: List<ResourceSyncException>) : SyncJobStatus()
diff --git a/engine/src/main/java/com/google/android/fhir/sync/Uploader.kt b/engine/src/main/java/com/google/android/fhir/sync/Uploader.kt
index efd90cdabd..f819ac0f91 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/Uploader.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/Uploader.kt
@@ -26,14 +26,19 @@ internal interface Uploader {
 
   /**
    * Uploads the local changes to the [DataSource]. Particular implementations should take care of
-   * transforming the [SquashedLocalChange]s to particular network operations.
+   * transforming the [SquashedLocalChange]s to particular network operations. If [ProgressCallback]
+   * is provided it also reports the intermediate progress
    */
-  suspend fun upload(
-    localChanges: List<LocalChange>,
-  ): Flow<UploadResult>
+  suspend fun upload(localChanges: List<LocalChange>): Flow<UploadResult>
 }
 
 internal sealed class UploadResult {
-  data class Success(val localChangeToken: LocalChangeToken, val resource: Bundle) : UploadResult()
+  data class Started(val total: Int) : UploadResult()
+  data class Success(
+    val localChangeToken: LocalChangeToken,
+    val resource: Bundle,
+    val total: Int,
+    val completed: Int
+  ) : UploadResult()
   data class Failure(val syncError: ResourceSyncException) : UploadResult()
 }
diff --git a/engine/src/main/java/com/google/android/fhir/sync/download/DownloaderImpl.kt b/engine/src/main/java/com/google/android/fhir/sync/download/DownloaderImpl.kt
index d66b0dc73b..a6b8ea9358 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/download/DownloaderImpl.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/download/DownloaderImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@ import com.google.android.fhir.sync.Downloader
 import com.google.android.fhir.sync.ResourceSyncException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.ResourceType
+import timber.log.Timber
 
 /**
  * Implementation of the [Downloader]. It orchestrates the pre & post processing of resources via
@@ -40,7 +42,27 @@ internal class DownloaderImpl(
 
   override suspend fun download(context: SyncDownloadContext): Flow<DownloadState> = flow {
     var resourceTypeToDownload: ResourceType = ResourceType.Bundle
-    emit(DownloadState.Started(resourceTypeToDownload))
+
+    // download count summary of all resources for progress i.e. <type, total, completed>
+    val progressSummary =
+      downloadWorkManager
+        .getSummaryRequestUrls(context)
+        .map { summary ->
+          summary.key to
+            runCatching { dataSource.download(summary.value) }
+              .onFailure { Timber.e(it) }
+              .getOrNull()
+              .takeIf { it is Bundle }
+              ?.let { (it as Bundle).total }
+        }
+        .also { Timber.i("Download summary " + it.joinToString()) }
+        .toMap()
+
+    val total = progressSummary.values.sumOf { it ?: 0 }
+    var completed = 0
+
+    emit(DownloadState.Started(resourceTypeToDownload, total))
+
     var url = downloadWorkManager.getNextRequestUrl(context)
     while (url != null) {
       try {
@@ -48,11 +70,13 @@ internal class DownloaderImpl(
           ResourceType.fromCode(url.findAnyOf(resourceTypeList, ignoreCase = true)!!.second)
 
         emit(
-          DownloadState.Success(
-            downloadWorkManager.processResponse(dataSource.download(url!!)).toList()
-          )
+          downloadWorkManager.processResponse(dataSource.download(url!!)).toList().let {
+            completed += it.size
+            DownloadState.Success(it, total, completed)
+          }
         )
       } catch (exception: Exception) {
+        Timber.e(exception)
         emit(DownloadState.Failure(ResourceSyncException(resourceTypeToDownload, exception)))
       }
 
diff --git a/engine/src/main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt b/engine/src/main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt
index 0ae5b55bdc..e0841b45dd 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManager.kt
@@ -46,19 +46,54 @@ class ResourceParamsBasedDownloadWorkManager(syncParams: ResourceSearchParams) :
       return urlOfTheNextPagesToDownloadForAResource.poll()
 
     return resourcesToDownloadWithSearchParams.poll()?.let { (resourceType, params) ->
-      val newParams = params.toMutableMap()
-      if (!params.containsKey(SyncDataParams.SORT_KEY)) {
-        newParams[SyncDataParams.SORT_KEY] = SyncDataParams.LAST_UPDATED_KEY
-      }
-      if (!params.containsKey(SyncDataParams.LAST_UPDATED_KEY)) {
-        val lastUpdate = context.getLatestTimestampFor(resourceType)
-        if (!lastUpdate.isNullOrEmpty()) {
-          newParams[SyncDataParams.LAST_UPDATED_KEY] = "$GREATER_THAN_PREFIX$lastUpdate"
+      val newParams =
+        params.toMutableMap().apply { putAll(getLastUpdatedParam(resourceType, params, context)) }
+
+      "${resourceType.name}?${newParams.concatParams()}"
+    }
+  }
+
+  /**
+   * Returns the map of resourceType and URL for summary of total count for each download request
+   */
+  override suspend fun getSummaryRequestUrls(
+    context: SyncDownloadContext
+  ): Map<ResourceType, String> {
+    return resourcesToDownloadWithSearchParams.associate { (resourceType, params) ->
+      val newParams =
+        params.toMutableMap().apply {
+          putAll(getLastUpdatedParam(resourceType, params, context))
+          putAll(getSummaryParam(params))
         }
+
+      resourceType to "${resourceType.name}?${newParams.concatParams()}"
+    }
+  }
+
+  private suspend fun getLastUpdatedParam(
+    resourceType: ResourceType,
+    params: ParamMap,
+    context: SyncDownloadContext
+  ): MutableMap<String, String> {
+    val newParams = mutableMapOf<String, String>()
+    if (!params.containsKey(SyncDataParams.SORT_KEY)) {
+      newParams[SyncDataParams.SORT_KEY] = SyncDataParams.LAST_UPDATED_KEY
+    }
+    if (!params.containsKey(SyncDataParams.LAST_UPDATED_KEY)) {
+      val lastUpdate = context.getLatestTimestampFor(resourceType)
+      if (!lastUpdate.isNullOrEmpty()) {
+        newParams[SyncDataParams.LAST_UPDATED_KEY] = "$GREATER_THAN_PREFIX$lastUpdate"
       }
+    }
+    return newParams
+  }
 
-      "${resourceType.name}?${newParams.concatParams()}"
+  private fun getSummaryParam(params: ParamMap): MutableMap<String, String> {
+    val newParams = mutableMapOf<String, String>()
+    if (!params.containsKey(SyncDataParams.SUMMARY_KEY)) {
+      newParams[SyncDataParams.SUMMARY_KEY] = SyncDataParams.SUMMARY_COUNT_VALUE
     }
+    return newParams
   }
 
   override suspend fun processResponse(response: Resource): Collection<Resource> {
@@ -67,9 +102,9 @@ class ResourceParamsBasedDownloadWorkManager(syncParams: ResourceSearchParams) :
     }
 
     return if (response is Bundle && response.type == Bundle.BundleType.SEARCHSET) {
-      response.link.firstOrNull { component -> component.relation == "next" }?.url?.let { next ->
-        urlOfTheNextPagesToDownloadForAResource.add(next)
-      }
+      response.link
+        .firstOrNull { component -> component.relation == "next" }
+        ?.url?.let { next -> urlOfTheNextPagesToDownloadForAResource.add(next) }
 
       response.entry.map { it.resource }
     } else {
diff --git a/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt b/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
index 3d2e5087d1..5a554a3d3c 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/remote/RemoteFhirService.kt
@@ -27,7 +27,6 @@ import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Resource
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Url
@@ -37,7 +36,7 @@ internal interface RemoteFhirService : DataSource {
 
   @GET override suspend fun download(@Url path: String): Resource
 
-  @POST(".") override suspend fun upload(@Body bundle: Bundle): Resource
+  @POST(".") override suspend fun upload(bundle: Bundle): Resource
 
   class Builder(
     private val baseUrl: String,
diff --git a/engine/src/main/java/com/google/android/fhir/sync/upload/BundleUploader.kt b/engine/src/main/java/com/google/android/fhir/sync/upload/BundleUploader.kt
index b61f656993..8b5af9a22d 100644
--- a/engine/src/main/java/com/google/android/fhir/sync/upload/BundleUploader.kt
+++ b/engine/src/main/java/com/google/android/fhir/sync/upload/BundleUploader.kt
@@ -37,24 +37,39 @@ internal class BundleUploader(
   private val localChangesPaginator: LocalChangesPaginator
 ) : Uploader {
 
-  override suspend fun upload(
-    localChanges: List<LocalChange>,
-  ): Flow<UploadResult> = flow {
+  override suspend fun upload(localChanges: List<LocalChange>): Flow<UploadResult> = flow {
+    val total = localChanges.size
+    var completed = 0
+
+    emit(UploadResult.Started(total))
+
     bundleGenerator.generate(localChangesPaginator.page(localChanges)).forEach {
       (bundle, localChangeTokens) ->
       try {
         val response = dataSource.upload(bundle)
-        emit(getUploadResult(response, localChangeTokens))
+
+        completed += bundle.entry.size
+        emit(getUploadResult(response, localChangeTokens, total, completed))
       } catch (e: Exception) {
         emit(UploadResult.Failure(ResourceSyncException(ResourceType.Bundle, e)))
       }
     }
   }
 
-  private fun getUploadResult(response: Resource, localChangeTokens: List<LocalChangeToken>) =
+  private fun getUploadResult(
+    response: Resource,
+    localChangeTokens: List<LocalChangeToken>,
+    total: Int,
+    completed: Int
+  ) =
     when {
       response is Bundle && response.type == Bundle.BundleType.TRANSACTIONRESPONSE -> {
-        UploadResult.Success(LocalChangeToken(localChangeTokens.flatMap { it.ids }), response)
+        UploadResult.Success(
+          LocalChangeToken(localChangeTokens.flatMap { it.ids }),
+          response,
+          total,
+          completed
+        )
       }
       response is OperationOutcome && response.issue.isNotEmpty() -> {
         UploadResult.Failure(
diff --git a/engine/src/test-common/java/com/google/android/fhir/resource/TestingUtils.kt b/engine/src/test-common/java/com/google/android/fhir/resource/TestingUtils.kt
index 87c2880c92..d9b8e2d340 100644
--- a/engine/src/test-common/java/com/google/android/fhir/resource/TestingUtils.kt
+++ b/engine/src/test-common/java/com/google/android/fhir/resource/TestingUtils.kt
@@ -30,6 +30,7 @@ import com.google.common.truth.Truth.assertThat
 import java.time.OffsetDateTime
 import java.util.Date
 import java.util.LinkedList
+import kotlin.streams.toList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import org.hl7.fhir.r4.model.Bundle
@@ -100,11 +101,20 @@ class TestingUtils constructor(private val iParser: IParser) {
   }
 
   open class TestDownloadManagerImpl(
-    queries: List<String> = listOf("Patient?address-city=NAIROBI")
+    val queries: List<String> = listOf("Patient?address-city=NAIROBI")
   ) : DownloadWorkManager {
     private val urls = LinkedList(queries)
 
     override suspend fun getNextRequestUrl(context: SyncDownloadContext): String? = urls.poll()
+    override suspend fun getSummaryRequestUrls(
+      context: SyncDownloadContext
+    ): Map<ResourceType, String> {
+      return queries
+        .stream()
+        .map { ResourceType.fromCode(it.substringBefore("?")) to it.plus("?_summary=count") }
+        .toList()
+        .toMap()
+    }
 
     override suspend fun processResponse(response: Resource): Collection<Resource> {
       val patient = Patient().setMeta(Meta().setLastUpdated(Date()))
@@ -134,7 +144,7 @@ class TestingUtils constructor(private val iParser: IParser) {
     override suspend fun syncUpload(
       upload: suspend (List<LocalChange>) -> Flow<Pair<LocalChangeToken, Resource>>
     ) {
-      upload(listOf())
+      upload(listOf(getLocalChange(ResourceType.Patient, "123")))
     }
 
     override suspend fun syncDownload(
@@ -142,12 +152,12 @@ class TestingUtils constructor(private val iParser: IParser) {
       download: suspend (SyncDownloadContext) -> Flow<List<Resource>>
     ) {
       download(
-        object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType): String {
-            return "123456788"
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType): String {
+              return "123456788"
+            }
           }
-        }
-      )
+        )
         .collect {}
     }
     override suspend fun count(search: Search): Long {
@@ -160,8 +170,14 @@ class TestingUtils constructor(private val iParser: IParser) {
 
     override suspend fun clearDatabase() {}
 
-    override suspend fun getLocalChange(type: ResourceType, id: String): LocalChange? {
-      TODO("Not yet implemented")
+    override suspend fun getLocalChange(type: ResourceType, id: String): LocalChange {
+      return LocalChange(
+        resourceType = type.name,
+        resourceId = id,
+        payload = "{}",
+        token = LocalChangeToken(listOf()),
+        type = LocalChange.Type.INSERT
+      )
     }
 
     override suspend fun purge(type: ResourceType, id: String, forcePurge: Boolean) {}
diff --git a/engine/src/test/java/com/google/android/fhir/UtilTest.kt b/engine/src/test/java/com/google/android/fhir/UtilTest.kt
index 7ab3955a3b..5bea3eb192 100644
--- a/engine/src/test/java/com/google/android/fhir/UtilTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/UtilTest.kt
@@ -101,6 +101,16 @@ class UtilTest : TestCase() {
     assertThat(isValidDateOnly("33-33-33")).isFalse()
   }
 
+  @Test
+  fun `percentOf() should return 0 when total is zero`() {
+    assertThat(percentOf(0, 0)).isEqualTo(0)
+  }
+
+  @Test
+  fun `percentOf() should return percentage`() {
+    assertThat(percentOf(25, 50)).isEqualTo(0.5)
+  }
+
   companion object {
     val TEST_OPERATION_OUTCOME_ERROR = OperationOutcome()
     val TEST_OPERATION_OUTCOME_INFO = OperationOutcome()
diff --git a/engine/src/test/java/com/google/android/fhir/sync/download/DownloaderImplTest.kt b/engine/src/test/java/com/google/android/fhir/sync/download/DownloaderImplTest.kt
index 3f333bdb81..2a1eecfdc2 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/download/DownloaderImplTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/download/DownloaderImplTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import com.google.android.fhir.sync.DataSource
 import com.google.android.fhir.sync.DownloadState
 import com.google.common.truth.Truth.assertThat
 import java.net.UnknownHostException
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.collectIndexed
 import kotlinx.coroutines.runBlocking
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Observation
@@ -83,6 +83,7 @@ class DownloaderImplTest {
         object : DataSource {
           override suspend fun download(path: String): Resource {
             return when {
+              path.contains("summary") -> Bundle().apply { total = 1 }
               path.contains("patient-page1") ->
                 searchPageParamToSearchResponseBundleMap["patient-page1"]!!
               path.contains("patient-page2") ->
@@ -108,7 +109,8 @@ class DownloaderImplTest {
       )
 
     val result = mutableListOf<DownloadState>()
-    downloader.download(
+    downloader
+      .download(
         object : SyncDownloadContext {
           override suspend fun getLatestTimestampFor(type: ResourceType): String? = null
         }
@@ -117,7 +119,7 @@ class DownloaderImplTest {
 
     assertThat(result.filterIsInstance<DownloadState.Started>())
       .containsExactly(
-        DownloadState.Started(ResourceType.Bundle),
+        DownloadState.Started(ResourceType.Bundle, 2), // 1 patient and 1 observation
       )
 
     assertThat(
@@ -129,7 +131,139 @@ class DownloaderImplTest {
 
   @Test
   fun `downloader with patient and observations should return failure in case of server or network error`() =
-      runBlocking {
+    runBlocking {
+      val downloader =
+        DownloaderImpl(
+          object : DataSource {
+            override suspend fun download(path: String): Resource {
+              return when {
+                path.contains("summary") -> Bundle().apply { total = 1 }
+                path.contains("patient-page1") ->
+                  searchPageParamToSearchResponseBundleMap["patient-page1"]!!
+                path.contains("patient-page2") ->
+                  OperationOutcome().apply {
+                    addIssue(
+                      OperationOutcome.OperationOutcomeIssueComponent().apply {
+                        diagnostics = "Server couldn't fulfil the request."
+                      }
+                    )
+                  }
+                path.contains("observation-page1") ->
+                  searchPageParamToSearchResponseBundleMap["observation-page1"]!!
+                path.contains("observation-page2") ->
+                  throw UnknownHostException(
+                    "Url host can't be found. Check if device is connected to internet."
+                  )
+                else -> OperationOutcome()
+              }
+            }
+
+            override suspend fun upload(bundle: Bundle): Resource {
+              TODO("Upload not tested in this path")
+            }
+          },
+          ResourceParamsBasedDownloadWorkManager(
+            mapOf(
+              ResourceType.Patient to mapOf("param" to "patient-page1"),
+              ResourceType.Observation to mapOf("param" to "observation-page1")
+            )
+          )
+        )
+
+      val result = mutableListOf<DownloadState>()
+      downloader
+        .download(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = null
+          }
+        )
+        .collect { result.add(it) }
+
+      assertThat(result.filterIsInstance<DownloadState.Started>())
+        .containsExactly(
+          DownloadState.Started(ResourceType.Bundle, 2), // 1 patient and 1 observation
+        )
+
+      assertThat(result.filterIsInstance<DownloadState.Failure>()).hasSize(2)
+
+      assertThat(result.filterIsInstance<DownloadState.Failure>().map { it.syncError.resourceType })
+        .containsExactly(ResourceType.Patient, ResourceType.Observation)
+        .inOrder()
+      assertThat(
+          result.filterIsInstance<DownloadState.Failure>().map { it.syncError.exception.message }
+        )
+        .containsExactly(
+          "Server couldn't fulfil the request.",
+          "Url host can't be found. Check if device is connected to internet."
+        )
+        .inOrder()
+    }
+
+  @Test
+  fun `downloader with patient and observations should continue to download observations if patient download fail`() =
+    runBlocking {
+      val downloader =
+        DownloaderImpl(
+          object : DataSource {
+            override suspend fun download(path: String): Resource {
+              return when {
+                path.contains("summary") -> Bundle().apply { total = 1 }
+                path.contains("patient-page1") || path.contains("patient-page2") ->
+                  OperationOutcome().apply {
+                    addIssue(
+                      OperationOutcome.OperationOutcomeIssueComponent().apply {
+                        diagnostics = "Server couldn't fulfil the request."
+                      }
+                    )
+                  }
+                path.contains("observation-page1") ->
+                  searchPageParamToSearchResponseBundleMap["observation-page1"]!!
+                path.contains("observation-page2") ->
+                  searchPageParamToSearchResponseBundleMap["observation-page2"]!!
+                else -> OperationOutcome()
+              }
+            }
+
+            override suspend fun upload(bundle: Bundle): Resource {
+              TODO("Not yet implemented")
+            }
+          },
+          ResourceParamsBasedDownloadWorkManager(
+            mapOf(
+              ResourceType.Patient to mapOf("param" to "patient-page1"),
+              ResourceType.Observation to mapOf("param" to "observation-page1")
+            )
+          )
+        )
+
+      val result = mutableListOf<DownloadState>()
+      downloader
+        .download(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = null
+          }
+        )
+        .collect { result.add(it) }
+
+      assertThat(result.filterIsInstance<DownloadState.Started>())
+        .containsExactly(
+          DownloadState.Started(ResourceType.Bundle, 2), // 1 patient and 1 observation
+        )
+
+      assertThat(result.filterIsInstance<DownloadState.Failure>().map { it.syncError.resourceType })
+        .containsExactly(ResourceType.Patient)
+
+      assertThat(
+          result
+            .filterIsInstance<DownloadState.Success>()
+            .flatMap { it.resources }
+            .filterIsInstance<Observation>()
+        )
+        .hasSize(2)
+    }
+
+  @Test
+  fun `downloader should emit Started state`() = runBlocking {
     val downloader =
       DownloaderImpl(
         object : DataSource {
@@ -137,122 +271,67 @@ class DownloaderImplTest {
             return when {
               path.contains("patient-page1") ->
                 searchPageParamToSearchResponseBundleMap["patient-page1"]!!
-              path.contains("patient-page2") ->
-                OperationOutcome().apply {
-                  addIssue(
-                    OperationOutcome.OperationOutcomeIssueComponent().apply {
-                      diagnostics = "Server couldn't fulfil the request."
-                    }
-                  )
-                }
-              path.contains("observation-page1") ->
-                searchPageParamToSearchResponseBundleMap["observation-page1"]!!
-              path.contains("observation-page2") ->
-                throw UnknownHostException(
-                  "Url host can't be found. Check if device is connected to internet."
-                )
               else -> OperationOutcome()
             }
           }
 
           override suspend fun upload(bundle: Bundle): Resource {
-            TODO("Upload not tested in this path")
+            throw UnsupportedOperationException()
           }
         },
         ResourceParamsBasedDownloadWorkManager(
-          mapOf(
-            ResourceType.Patient to mapOf("param" to "patient-page1"),
-            ResourceType.Observation to mapOf("param" to "observation-page1")
-          )
+          mapOf(ResourceType.Patient to mapOf("param" to "patient-page1"))
         )
       )
 
     val result = mutableListOf<DownloadState>()
-    downloader.download(
+    downloader
+      .download(
         object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = null
+          override suspend fun getLatestTimestampFor(type: ResourceType): String? = null
         }
       )
-      .collect { result.add(it) }
-
-    assertThat(result.filterIsInstance<DownloadState.Started>())
-      .containsExactly(
-        DownloadState.Started(ResourceType.Bundle),
-      )
+      .collectIndexed { index, value -> result.add(value) }
 
-    assertThat(result.filterIsInstance<DownloadState.Failure>()).hasSize(2)
-
-    assertThat(result.filterIsInstance<DownloadState.Failure>().map { it.syncError.resourceType })
-      .containsExactly(ResourceType.Patient, ResourceType.Observation)
-      .inOrder()
-    assertThat(
-        result.filterIsInstance<DownloadState.Failure>().map { it.syncError.exception.message }
-      )
-      .containsExactly(
-        "Server couldn't fulfil the request.",
-        "Url host can't be found. Check if device is connected to internet."
-      )
-      .inOrder()
+    assertThat(result.first()).isInstanceOf(DownloadState.Started::class.java)
   }
 
   @Test
-  fun `downloader with patient and observations should continue to download observations if patient download fail`() =
-      runBlocking {
+  fun `downloader should emit Success state`() = runBlocking {
     val downloader =
       DownloaderImpl(
         object : DataSource {
           override suspend fun download(path: String): Resource {
             return when {
-              path.contains("patient-page1") || path.contains("patient-page2") ->
-                OperationOutcome().apply {
-                  addIssue(
-                    OperationOutcome.OperationOutcomeIssueComponent().apply {
-                      diagnostics = "Server couldn't fulfil the request."
-                    }
-                  )
-                }
-              path.contains("observation-page1") ->
-                searchPageParamToSearchResponseBundleMap["observation-page1"]!!
-              path.contains("observation-page2") ->
-                searchPageParamToSearchResponseBundleMap["observation-page2"]!!
+              path.contains("patient-page1") ->
+                searchPageParamToSearchResponseBundleMap["patient-page1"]!!.apply { total = 1 }
               else -> OperationOutcome()
             }
           }
 
           override suspend fun upload(bundle: Bundle): Resource {
-            TODO("Not yet implemented")
+            throw UnsupportedOperationException()
           }
         },
         ResourceParamsBasedDownloadWorkManager(
-          mapOf(
-            ResourceType.Patient to mapOf("param" to "patient-page1"),
-            ResourceType.Observation to mapOf("param" to "observation-page1")
-          )
+          mapOf(ResourceType.Patient to mapOf("param" to "patient-page1"))
         )
       )
 
     val result = mutableListOf<DownloadState>()
-    downloader.download(
+    downloader
+      .download(
         object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = null
+          override suspend fun getLatestTimestampFor(type: ResourceType): String? = null
         }
       )
-      .collect { result.add(it) }
+      .collectIndexed { index, value -> result.add(value) }
 
-    assertThat(result.filterIsInstance<DownloadState.Started>())
-      .containsExactly(
-        DownloadState.Started(ResourceType.Bundle),
-      )
-
-    assertThat(result.filterIsInstance<DownloadState.Failure>().map { it.syncError.resourceType })
-      .containsExactly(ResourceType.Patient)
+    assertThat(result.first()).isInstanceOf(DownloadState.Started::class.java)
+    assertThat(result.elementAt(1)).isInstanceOf(DownloadState.Success::class.java)
 
-    assertThat(
-        result
-          .filterIsInstance<DownloadState.Success>()
-          .flatMap { it.resources }
-          .filterIsInstance<Observation>()
-      )
-      .hasSize(2)
+    val success = result.elementAt(1) as DownloadState.Success
+    assertThat(success.total).isEqualTo(1)
+    assertThat(success.completed).isEqualTo(1)
   }
 }
diff --git a/engine/src/test/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManagerTest.kt b/engine/src/test/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManagerTest.kt
index ff6acdc43d..0d2351d0e5 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManagerTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/download/ResourceParamsBasedDownloadWorkManagerTest.kt
@@ -115,86 +115,114 @@ class ResourceParamsBasedDownloadWorkManagerTest {
 
   @Test
   fun getNextRequestUrl_withLastUpdatedTimeProvidedInContext_ShouldAppendGtPrefixToLastUpdatedSearchParam() =
-      runBlockingTest {
-    val downloadManager =
-      ResourceParamsBasedDownloadWorkManager(mapOf(ResourceType.Patient to emptyMap()))
-    val url =
-      downloadManager.getNextRequestUrl(
-        object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-06-28"
-        }
-      )
-    assertThat(url).isEqualTo("Patient?_sort=_lastUpdated&_lastUpdated=gt2022-06-28")
-  }
+    runBlockingTest {
+      val downloadManager =
+        ResourceParamsBasedDownloadWorkManager(mapOf(ResourceType.Patient to emptyMap()))
+      val url =
+        downloadManager.getNextRequestUrl(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-06-28"
+          }
+        )
+      assertThat(url).isEqualTo("Patient?_sort=_lastUpdated&_lastUpdated=gt2022-06-28")
+    }
 
   @Test
   fun getNextRequestUrl_withLastUpdatedSyncParamProvided_shouldReturnUrlWithExactProvidedLastUpdatedSyncParam() =
-      runBlockingTest {
-    val downloadManager =
-      ResourceParamsBasedDownloadWorkManager(
-        mapOf(
-          ResourceType.Patient to
-            mapOf(
-              SyncDataParams.LAST_UPDATED_KEY to "2022-06-28",
-              SyncDataParams.SORT_KEY to "status"
-            )
+    runBlockingTest {
+      val downloadManager =
+        ResourceParamsBasedDownloadWorkManager(
+          mapOf(
+            ResourceType.Patient to
+              mapOf(
+                SyncDataParams.LAST_UPDATED_KEY to "2022-06-28",
+                SyncDataParams.SORT_KEY to "status"
+              )
+          )
         )
-      )
-    val url =
-      downloadManager.getNextRequestUrl(
-        object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-07-07"
-        }
-      )
-    assertThat(url).isEqualTo("Patient?_lastUpdated=2022-06-28&_sort=status")
-  }
+      val url =
+        downloadManager.getNextRequestUrl(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-07-07"
+          }
+        )
+      assertThat(url).isEqualTo("Patient?_lastUpdated=2022-06-28&_sort=status")
+    }
 
   @Test
   fun getNextRequestUrl_withLastUpdatedSyncParamHavingGtPrefix_shouldReturnUrlWithExactProvidedLastUpdatedSyncParam() =
-      runBlockingTest {
-    val downloadManager =
-      ResourceParamsBasedDownloadWorkManager(
-        mapOf(ResourceType.Patient to mapOf(SyncDataParams.LAST_UPDATED_KEY to "gt2022-06-28"))
-      )
-    val url =
-      downloadManager.getNextRequestUrl(
-        object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-07-07"
-        }
-      )
-    assertThat(url).isEqualTo("Patient?_lastUpdated=gt2022-06-28&_sort=_lastUpdated")
-  }
+    runBlockingTest {
+      val downloadManager =
+        ResourceParamsBasedDownloadWorkManager(
+          mapOf(ResourceType.Patient to mapOf(SyncDataParams.LAST_UPDATED_KEY to "gt2022-06-28"))
+        )
+      val url =
+        downloadManager.getNextRequestUrl(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-07-07"
+          }
+        )
+      assertThat(url).isEqualTo("Patient?_lastUpdated=gt2022-06-28&_sort=_lastUpdated")
+    }
 
   @Test
   fun getNextRequestUrl_withNullUpdatedTimeStamp_shouldReturnUrlWithoutLastUpdatedQueryParam() =
-      runBlockingTest {
-    val downloadManager =
-      ResourceParamsBasedDownloadWorkManager(
-        mapOf(ResourceType.Patient to mapOf(Patient.ADDRESS_CITY.paramName to "NAIROBI"))
-      )
-    val actual =
-      downloadManager.getNextRequestUrl(
-        object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = null
-        }
-      )
-    assertThat(actual).isEqualTo("Patient?address-city=NAIROBI&_sort=_lastUpdated")
-  }
+    runBlockingTest {
+      val downloadManager =
+        ResourceParamsBasedDownloadWorkManager(
+          mapOf(ResourceType.Patient to mapOf(Patient.ADDRESS_CITY.paramName to "NAIROBI"))
+        )
+      val actual =
+        downloadManager.getNextRequestUrl(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = null
+          }
+        )
+      assertThat(actual).isEqualTo("Patient?address-city=NAIROBI&_sort=_lastUpdated")
+    }
 
   @Test
   fun getNextRequestUrl_withEmptyUpdatedTimeStamp_shouldReturnUrlWithoutLastUpdatedQueryParam() =
-      runBlockingTest {
+    runBlockingTest {
+      val downloadManager =
+        ResourceParamsBasedDownloadWorkManager(
+          mapOf(ResourceType.Patient to mapOf(Patient.ADDRESS_CITY.paramName to "NAIROBI"))
+        )
+      val actual =
+        downloadManager.getNextRequestUrl(
+          object : SyncDownloadContext {
+            override suspend fun getLatestTimestampFor(type: ResourceType) = ""
+          }
+        )
+      assertThat(actual).isEqualTo("Patient?address-city=NAIROBI&_sort=_lastUpdated")
+    }
+
+  @Test
+  fun `getSummaryRequestUrls should return resource summary urls`() = runBlockingTest {
     val downloadManager =
       ResourceParamsBasedDownloadWorkManager(
-        mapOf(ResourceType.Patient to mapOf(Patient.ADDRESS_CITY.paramName to "NAIROBI"))
+        mapOf(
+          ResourceType.Patient to mapOf(Patient.ADDRESS_CITY.paramName to "NAIROBI"),
+          ResourceType.Immunization to emptyMap(),
+          ResourceType.Observation to emptyMap(),
+        )
       )
-    val actual =
-      downloadManager.getNextRequestUrl(
+
+    val urls =
+      downloadManager.getSummaryRequestUrls(
         object : SyncDownloadContext {
-          override suspend fun getLatestTimestampFor(type: ResourceType) = ""
+          override suspend fun getLatestTimestampFor(type: ResourceType) = "2022-03-20"
         }
       )
-    assertThat(actual).isEqualTo("Patient?address-city=NAIROBI&_sort=_lastUpdated")
+
+    assertThat(urls.map { it.key })
+      .containsExactly(ResourceType.Patient, ResourceType.Immunization, ResourceType.Observation)
+    assertThat(urls.map { it.value })
+      .containsExactly(
+        "Patient?address-city=NAIROBI&_sort=_lastUpdated&_lastUpdated=gt2022-03-20&_summary=count",
+        "Immunization?_sort=_lastUpdated&_lastUpdated=gt2022-03-20&_summary=count",
+        "Observation?_sort=_lastUpdated&_lastUpdated=gt2022-03-20&_summary=count"
+      )
   }
 
   @Test
diff --git a/engine/src/test/java/com/google/android/fhir/sync/upload/BundleUploaderTest.kt b/engine/src/test/java/com/google/android/fhir/sync/upload/BundleUploaderTest.kt
index 12482afe8c..7899f639b8 100644
--- a/engine/src/test/java/com/google/android/fhir/sync/upload/BundleUploaderTest.kt
+++ b/engine/src/test/java/com/google/android/fhir/sync/upload/BundleUploaderTest.kt
@@ -52,8 +52,27 @@ class BundleUploaderTest {
         .upload(localChanges)
         .toList()
 
-    assertThat(result).hasSize(1)
-    assertThat(result.first()).isInstanceOf(UploadResult.Success::class.java)
+    assertThat(result).hasSize(2)
+    assertThat(result.first()).isInstanceOf(UploadResult.Started::class.java)
+    assertThat(result.last()).isInstanceOf(UploadResult.Success::class.java)
+
+    val success = result.last() as UploadResult.Success
+    assertThat(success.total).isEqualTo(1)
+    assertThat(success.completed).isEqualTo(1)
+  }
+
+  @Test
+  fun `upload Bundle transaction should emit Started state`() = runBlocking {
+    val result =
+      BundleUploader(
+          TestingUtils.BundleDataSource { Bundle() },
+          TransactionBundleGenerator.getDefault(),
+          LocalChangesPaginator.DEFAULT
+        )
+        .upload(localChanges)
+        .toList()
+
+    assertThat(result.first()).isInstanceOf(UploadResult.Started::class.java)
   }
 
   @Test
@@ -76,8 +95,8 @@ class BundleUploaderTest {
         .upload(localChanges)
         .toList()
 
-    assertThat(result).hasSize(1)
-    assertThat(result.first()).isInstanceOf(UploadResult.Failure::class.java)
+    assertThat(result).hasSize(2)
+    assertThat(result.last()).isInstanceOf(UploadResult.Failure::class.java)
   }
 
   @Test
@@ -91,8 +110,8 @@ class BundleUploaderTest {
         .upload(localChanges)
         .toList()
 
-    assertThat(result).hasSize(1)
-    assertThat(result.first()).isInstanceOf(UploadResult.Failure::class.java)
+    assertThat(result).hasSize(2)
+    assertThat(result.last()).isInstanceOf(UploadResult.Failure::class.java)
   }
 
   companion object {

From 2363c11b8b361facb94d5009e27db6ab8dd41d84 Mon Sep 17 00:00:00 2001
From: Jing Tang <jingtang@google.com>
Date: Thu, 23 Feb 2023 16:55:12 +0000
Subject: [PATCH 5/6] Rename view holder factories and reorganize files (#1883)

* Renaming

* Rename test files

* Run spotless apply

* Fix imports for attachment

* Correct package declarations

* Fix unit and instrumentation tests

* Update MoreEnumerationsTest.kt

* Spotless apply

* Move view holder factory tests in the right package

* Rename views

* Fix build

* Update QuestionnaireEditAdapterTest.kt

* Create extensions package

* Extract capitalize extension function
---
 .../catalog/ComponentsRecyclerViewadapter.kt  |   4 +-
 .../fhir/catalog/CustomNumberPickerFactory.kt |  10 +-
 .../catalog/CustomQuestionnaireFragment.kt    |  16 +-
 ...eaderViewHolderFactoryInstrumentedTest.kt} |  16 +-
 ...y.kt => BarCodeReaderViewHolderFactory.kt} |  32 +--
 .../QuestionnaireUiEspressoTest.kt            |   2 +-
 ...umberViewHolderFactoryInstrumentedTest.kt} |  54 ++--
 ...ttachmentViewHolderFactoryEspressoTest.kt} |  30 ++-
 ...atePickerViewHolderFactoryEspressoTest.kt} |  24 +-
 ...imePickerViewHolderFactoryEspressoTest.kt} |  10 +-
 ... DropDownViewHolderFactoryEspressoTest.kt} |  58 +++--
 ...edTest.kt => MediaViewInstrumentedTest.kt} |   6 +-
 ...ultiSelectViewHolderFactoryEspressoTest.kt |  82 +++---
 ...xtQuantityViewHolderFactoryEspressoTest.kt |  16 +-
 ...ultiSelectHolderFactoryInstrumentedTest.kt |  12 +-
 .../datacapture/QuestionnaireAdapterItem.kt   |   6 +-
 ...Adapter.kt => QuestionnaireEditAdapter.kt} | 183 +++++++------
 .../fhir/datacapture/QuestionnaireFragment.kt |  16 +-
 ...apter.kt => QuestionnaireReviewAdapter.kt} |   8 +-
 ...Type.kt => QuestionnaireViewHolderType.kt} |   4 +-
 .../datacapture/QuestionnaireViewModel.kt     |  15 +-
 ...ory.kt => PhoneNumberViewHolderFactory.kt} |  25 +-
 .../enablement/EnablementEvaluator.kt         |   2 +-
 .../{utilities => extensions}/MoreContexts.kt |   2 +-
 .../MoreEnumerations.kt}                      |  19 +-
 .../{ => extensions}/MoreExpressions.kt       |   0
 .../MoreLocalDateTimes.kt                     |   2 +-
 .../MoreLocalDates.kt                         |   7 +-
 .../MoreLocalTimes.kt                         |   4 +-
 ...QuestionnaireItemAnswerOptionComponents.kt |   0
 .../MoreQuestionnaireItemComponents.kt        |  18 +-
 ...estionnaireResponseItemAnswerComponents.kt |   0
 .../{ => extensions}/MoreQuestionnaires.kt    |   5 +-
 ...oreQuestionnairesResponseItemComponents.kt |   0
 .../MoreQuestionnairesResponses.kt            |   0
 .../datatype => extensions}/MoreTypes.kt      |  30 ++-
 .../fhirpath/ExpressionEvaluator.kt           |   1 +
 .../{utilities => fhirpath}/FhirPathUtil.kt   |   2 +-
 .../datacapture/mapping/ResourceMapper.kt     |  25 +-
 .../utilities/MoreReflectionUtil.kt           |  32 ---
 .../utilities/TypeConversionUtil.kt           |  43 ----
 ...upTypeHeaderView.kt => GroupHeaderView.kt} |   4 +-
 ...onnaireItemHeaderView.kt => HeaderView.kt} |   5 +-
 ...tionnaireItemMediaView.kt => MediaView.kt} |   7 +-
 .../views/OptionSelectDialogFragment.kt       |  15 +-
 ...emViewItem.kt => QuestionnaireViewItem.kt} |  28 +-
 .../attachment/CameraLauncherFragment.kt      |   5 +-
 .../OpenDocumentLauncherFragment.kt           |   5 +-
 .../AttachmentViewHolderFactory.kt}           |  42 ++-
 .../AutoCompleteViewHolderFactory.kt}         |  43 ++--
 .../BooleanChoiceViewHolderFactory.kt}        |  35 +--
 .../CheckBoxGroupViewHolderFactory.kt}        |  41 +--
 .../DatePickerViewHolderFactory.kt}           |  54 ++--
 .../DateTimePickerViewHolderFactory.kt}       |  46 ++--
 .../DialogSelectViewHolderFactory.kt}         |  30 ++-
 .../DisplayViewHolderFactory.kt}              |  16 +-
 .../DropDownViewHolderFactory.kt}             |  36 ++-
 .../EditTextDecimalViewHolderFactory.kt}      |  23 +-
 .../EditTextIntegerViewHolderFactory.kt}      |  26 +-
 .../EditTextMultiLineViewHolderFactory.kt}    |  11 +-
 .../EditTextQuantityViewHolderFactory.kt}     |  24 +-
 .../EditTextSingleLineViewHolderFactory.kt}   |  11 +-
 .../EditTextStringViewHolderDelegate.kt}      |  21 +-
 .../EditTextViewHolderFactory.kt}             |  31 +--
 .../GroupViewHolderFactory.kt}                |  25 +-
 .../QuestionnaireItemViewHolderFactory.kt     |  26 +-
 .../RadioGroupViewHolderFactory.kt}           |  29 ++-
 .../ReviewViewHolderFactory.kt}               |  23 +-
 .../SliderViewHolderFactory.kt}               |  30 +--
 ...ttachment_view.xml => attachment_view.xml} |   4 +-
 ...icker_view.xml => boolean_choice_view.xml} |   4 +-
 ..._check_box_view.xml => check_box_view.xml} |   0
 ...group_view.xml => checkbox_group_view.xml} |   4 +-
 ...e_picker_view.xml => date_picker_view.xml} |   4 +-
 ...ker_view.xml => date_time_picker_view.xml} |   4 +-
 ...item_display_view.xml => display_view.xml} |   4 +-
 ..._list_item.xml => drop_down_list_item.xml} |   0
 ..._drop_down_view.xml => drop_down_view.xml} |   4 +-
 ...w.xml => edit_text_auto_complete_view.xml} |   4 +-
 ...view.xml => edit_text_multi_line_view.xml} |   4 +-
 ...iew.xml => edit_text_single_line_view.xml} |   4 +-
 ..._header_view.xml => group_header_view.xml} |   4 +-
 ..._header.xml => group_type_header_view.xml} |   0
 ...nnaire_item_header.xml => header_view.xml} |   0
 ...ionnaire_item_media.xml => media_view.xml} |   0
 ...ect_dialog.xml => multi_select_dialog.xml} |   2 +-
 ...n_item_multi.xml => option_item_multi.xml} |   0
 ....xml => option_item_other_add_another.xml} |   0
 ...er_text.xml => option_item_other_text.xml} |   0
 ...item_single.xml => option_item_single.xml} |   0
 ...select_view.xml => option_select_view.xml} |   4 +-
 ...item_radio_button.xml => radio_button.xml} |   0
 ...io_group_view.xml => radio_group_view.xml} |   4 +-
 ...estion_answer_view.xml => review_view.xml} |   4 +-
 ...nnaire_item_slider.xml => slider_view.xml} |   4 +-
 ...est.kt => QuestionnaireEditAdapterTest.kt} | 240 +++++++++---------
 .../datacapture/QuestionnaireFragmentTest.kt  |   4 +-
 ...t.kt => QuestionnaireReviewAdapterTest.kt} |  30 +--
 ....kt => QuestionnaireViewHolderTypeTest.kt} |   8 +-
 .../datacapture/QuestionnaireViewModelTest.kt |  11 +-
 .../MoreContextsTest.kt                       |   3 +-
 .../MoreEnumerationsTest.kt}                  |  24 +-
 .../{ => extensions}/MoreExpressionsTest.kt   |   4 +-
 .../MoreLocalDateTimesTest.kt                 |   4 +-
 .../MoreLocalDatesTest.kt                     |   8 +-
 .../MoreLocalTimesTest.kt                     |   3 +-
 ...ionnaireItemAnswerOptionComponentsTest.kt} |   6 +-
 .../MoreQuestionnaireItemComponentsTest.kt    |  57 ++++-
 ...nnaireResponseItemAnswerComponentsTest.kt} |  10 +-
 ...QuestionnaireResponseItemComponentsTest.kt |   3 +-
 .../MoreQuestionnaireResponsesTest.kt         |   3 +-
 .../MoreQuestionnairesTest.kt                 |   5 +-
 .../datatype => extensions}/MoreTypesTest.kt  |  33 ++-
 .../fhirpath/ExpressionEvaluatorTest.kt       |   1 +
 .../FhirPathUtilTest.kt                       |   2 +-
 .../datacapture/mapping/ResourceMapperTest.kt |   2 +-
 .../utilities/MoreEnumerationTest.kt          |  42 ---
 .../utilities/TypeConversionUtilTest.kt       |  55 ----
 ...aderViewTest.kt => GroupHeaderViewTest.kt} |   4 +-
 ...temHeaderViewTest.kt => HeaderViewTest.kt} |   4 +-
 ...emTest.kt => QuestionnaireViewItemTest.kt} | 144 +++++------
 .../AutoCompleteViewHolderFactoryTest.kt}     |  23 +-
 .../BooleanChoiceViewHolderFactoryTest.kt}    |  81 +++---
 .../CheckBoxGroupViewHolderFactoryTest.kt}    |  49 ++--
 .../DatePickerViewHolderFactoryTest.kt}       |  53 ++--
 .../DateTimePickerViewHolderFactoryTest.kt}   |  57 +++--
 .../DisplayViewHolderFactoryTest.kt}          |  11 +-
 .../DropDownViewHolderFactoryTest.kt}         |  29 ++-
 .../EditTextDecimalViewHolderFactoryTest.kt}  |  39 +--
 .../EditTextIntegerViewHolderFactoryTest.kt}  |  39 +--
 ...EditTextMultiLineViewHolderFactoryTest.kt} |  39 +--
 .../EditTextQuantityViewHolderFactoryTest.kt} |  47 ++--
 ...ditTextSingleLineViewHolderFactoryTest.kt} |  39 +--
 .../GroupViewHolderFactoryTest.kt}            |  36 ++-
 .../RadioGroupViewHolderFactoryTest.kt}       |  53 ++--
 .../ReviewViewHolderFactoryTest.kt}           |  32 +--
 .../SliderViewHolderFactoryTest.kt}           |  48 ++--
 137 files changed, 1474 insertions(+), 1486 deletions(-)
 rename contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/{QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest.kt => BarCodeReaderViewHolderFactoryInstrumentedTest.kt} (90%)
 rename contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/{QuestionnaireItemBarCodeReaderViewHolderFactory.kt => BarCodeReaderViewHolderFactory.kt} (75%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/{QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt => PhoneNumberViewHolderFactoryInstrumentedTest.kt} (83%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemAttachmentViewHolderFactoryEspressoTest.kt => AttachmentViewHolderFactoryEspressoTest.kt} (96%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDatePickerViewHolderFactoryEspressoTest.kt => DatePickerViewHolderFactoryEspressoTest.kt} (95%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt => DateTimePickerViewHolderFactoryEspressoTest.kt} (92%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt => DropDownViewHolderFactoryEspressoTest.kt} (96%)
 rename datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemMediaViewInstrumentedTest.kt => MediaViewInstrumentedTest.kt} (97%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{QuestionnaireItemEditAdapter.kt => QuestionnaireEditAdapter.kt} (51%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{QuestionnaireItemReviewAdapter.kt => QuestionnaireReviewAdapter.kt} (78%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{QuestionnaireItemViewHolderType.kt => QuestionnaireViewHolderType.kt} (89%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/{QuestionnaireItemPhoneNumberViewHolderFactory.kt => PhoneNumberViewHolderFactory.kt} (68%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreContexts.kt (96%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities/MoreEnumeration.kt => extensions/MoreEnumerations.kt} (80%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreExpressions.kt (100%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalDateTimes.kt (95%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalDates.kt (94%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalTimes.kt (93%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireItemAnswerOptionComponents.kt (100%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireItemComponents.kt (97%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireResponseItemAnswerComponents.kt (100%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaires.kt (92%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnairesResponseItemComponents.kt (100%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnairesResponses.kt (100%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{common/datatype => extensions}/MoreTypes.kt (81%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/{utilities => fhirpath}/FhirPathUtil.kt (95%)
 delete mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtil.kt
 delete mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtil.kt
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireGroupTypeHeaderView.kt => GroupHeaderView.kt} (90%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemHeaderView.kt => HeaderView.kt} (95%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemMediaView.kt => MediaView.kt} (93%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemViewItem.kt => QuestionnaireViewItem.kt} (89%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemAttachmentViewHolderFactory.kt => factories/AttachmentViewHolderFactory.kt} (92%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemAutoCompleteViewHolderFactory.kt => factories/AutoCompleteViewHolderFactory.kt} (83%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemBooleanTypePickerViewHolderFactory.kt => factories/BooleanChoiceViewHolderFactory.kt} (80%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemCheckBoxGroupViewHolderFactory.kt => factories/CheckBoxGroupViewHolderFactory.kt} (80%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDatePickerViewHolderFactory.kt => factories/DatePickerViewHolderFactory.kt} (87%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDateTimePickerViewHolderFactory.kt => factories/DateTimePickerViewHolderFactory.kt} (87%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDialogSelectViewHolderFactory.kt => factories/DialogSelectViewHolderFactory.kt} (87%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDisplayViewHolderFactory.kt => factories/DisplayViewHolderFactory.kt} (64%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDropDownViewHolderFactory.kt => factories/DropDownViewHolderFactory.kt} (83%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextDecimalViewHolderFactory.kt => factories/EditTextDecimalViewHolderFactory.kt} (78%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextIntegerViewHolderFactory.kt => factories/EditTextIntegerViewHolderFactory.kt} (78%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextMultiLineViewHolderFactory.kt => factories/EditTextMultiLineViewHolderFactory.kt} (65%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextQuantityViewHolderFactory.kt => factories/EditTextQuantityViewHolderFactory.kt} (83%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextSingleLineViewHolderFactory.kt => factories/EditTextSingleLineViewHolderFactory.kt} (65%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextStringViewHolderDelegate.kt => factories/EditTextStringViewHolderDelegate.kt} (74%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextViewHolderFactory.kt => factories/EditTextViewHolderFactory.kt} (79%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemGroupViewHolderFactory.kt => factories/GroupViewHolderFactory.kt} (73%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{ => factories}/QuestionnaireItemViewHolderFactory.kt (75%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemRadioGroupViewHolderFactory.kt => factories/RadioGroupViewHolderFactory.kt} (85%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.kt => factories/ReviewViewHolderFactory.kt} (75%)
 rename datacapture/src/main/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemSliderViewHolderFactory.kt => factories/SliderViewHolderFactory.kt} (78%)
 rename datacapture/src/main/res/layout/{questionnaire_item_attachment_view.xml => attachment_view.xml} (97%)
 rename datacapture/src/main/res/layout/{questionnaire_item_boolean_type_picker_view.xml => boolean_choice_view.xml} (95%)
 rename datacapture/src/main/res/layout/{questionnaire_item_check_box_view.xml => check_box_view.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_checkbox_group_view.xml => checkbox_group_view.xml} (93%)
 rename datacapture/src/main/res/layout/{questionnaire_item_date_picker_view.xml => date_picker_view.xml} (93%)
 rename datacapture/src/main/res/layout/{questionnaire_item_date_time_picker_view.xml => date_time_picker_view.xml} (96%)
 rename datacapture/src/main/res/layout/{questionnaire_item_display_view.xml => display_view.xml} (89%)
 rename datacapture/src/main/res/layout/{questionnaire_item_drop_down_list_item.xml => drop_down_list_item.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_drop_down_view.xml => drop_down_view.xml} (92%)
 rename datacapture/src/main/res/layout/{questionnaire_item_edit_text_auto_complete_view.xml => edit_text_auto_complete_view.xml} (95%)
 rename datacapture/src/main/res/layout/{questionnaire_item_edit_text_multi_line_view.xml => edit_text_multi_line_view.xml} (92%)
 rename datacapture/src/main/res/layout/{questionnaire_item_edit_text_single_line_view.xml => edit_text_single_line_view.xml} (92%)
 rename datacapture/src/main/res/layout/{questionnaire_item_group_header_view.xml => group_header_view.xml} (93%)
 rename datacapture/src/main/res/layout/{questionnaire_group_type_header.xml => group_type_header_view.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_header.xml => header_view.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_media.xml => media_view.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_multi_select_dialog.xml => multi_select_dialog.xml} (97%)
 rename datacapture/src/main/res/layout/{questionnaire_item_option_item_multi.xml => option_item_multi.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_option_item_other_add_another.xml => option_item_other_add_another.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_option_item_other_text.xml => option_item_other_text.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_option_item_single.xml => option_item_single.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_option_select_view.xml => option_select_view.xml} (92%)
 rename datacapture/src/main/res/layout/{questionnaire_item_radio_button.xml => radio_button.xml} (100%)
 rename datacapture/src/main/res/layout/{questionnaire_item_radio_group_view.xml => radio_group_view.xml} (93%)
 rename datacapture/src/main/res/layout/{questionnaire_item_simple_question_answer_view.xml => review_view.xml} (92%)
 rename datacapture/src/main/res/layout/{questionnaire_item_slider.xml => slider_view.xml} (91%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{QuestionnaireItemEditAdapterTest.kt => QuestionnaireEditAdapterTest.kt} (77%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{QuestionnaireItemReviewAdapterTest.kt => QuestionnaireReviewAdapterTest.kt} (73%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{QuestionnaireItemViewHolderTypeTest.kt => QuestionnaireViewHolderTypeTest.kt} (80%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreContextsTest.kt (92%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities/MoreReflectionUtilTest.kt => extensions/MoreEnumerationsTest.kt} (65%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{ => extensions}/MoreExpressionsTest.kt (91%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalDateTimesTest.kt (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalDatesTest.kt (91%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities => extensions}/MoreLocalTimesTest.kt (95%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{MoreQuestionnaireItemAnswerOptionComponent.kt => extensions/MoreQuestionnaireItemAnswerOptionComponentsTest.kt} (96%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireItemComponentsTest.kt (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{MoreQuestionnaireResponseItemAnswerComponentTest.kt => extensions/MoreQuestionnaireResponseItemAnswerComponentsTest.kt} (97%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireResponseItemComponentsTest.kt (95%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnaireResponsesTest.kt (95%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{ => extensions}/MoreQuestionnairesTest.kt (93%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{common/datatype => extensions}/MoreTypesTest.kt (83%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/{utilities => fhirpath}/FhirPathUtilTest.kt (96%)
 delete mode 100644 datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreEnumerationTest.kt
 delete mode 100644 datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtilTest.kt
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireGroupTypeHeaderViewTest.kt => GroupHeaderViewTest.kt} (98%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemHeaderViewTest.kt => HeaderViewTest.kt} (98%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemViewItemTest.kt => QuestionnaireViewItemTest.kt} (89%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt => factories/AutoCompleteViewHolderFactoryTest.kt} (95%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemBooleanTypePickerViewHolderFactoryTest.kt => factories/BooleanChoiceViewHolderFactoryTest.kt} (86%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemCheckBoxGroupViewHolderFactoryTest.kt => factories/CheckBoxGroupViewHolderFactoryTest.kt} (97%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDatePickerViewHolderFactoryTest.kt => factories/DatePickerViewHolderFactoryTest.kt} (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt => factories/DateTimePickerViewHolderFactoryTest.kt} (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDisplayViewHolderFactoryTest.kt => factories/DisplayViewHolderFactoryTest.kt} (87%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemDropDownViewHolderFactoryTest.kt => factories/DropDownViewHolderFactoryTest.kt} (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt => factories/EditTextDecimalViewHolderFactoryTest.kt} (89%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt => factories/EditTextIntegerViewHolderFactoryTest.kt} (90%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt => factories/EditTextMultiLineViewHolderFactoryTest.kt} (89%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt => factories/EditTextQuantityViewHolderFactoryTest.kt} (88%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt => factories/EditTextSingleLineViewHolderFactoryTest.kt} (89%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemGroupViewHolderFactoryTest.kt => factories/GroupViewHolderFactoryTest.kt} (87%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemRadioGroupViewHolderFactoryTest.kt => factories/RadioGroupViewHolderFactoryTest.kt} (97%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt => factories/ReviewViewHolderFactoryTest.kt} (94%)
 rename datacapture/src/test/java/com/google/android/fhir/datacapture/views/{QuestionnaireItemSliderViewHolderFactoryTest.kt => factories/SliderViewHolderFactoryTest.kt} (93%)

diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentsRecyclerViewadapter.kt b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentsRecyclerViewadapter.kt
index fe5881e647..b503e7d8c3 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentsRecyclerViewadapter.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentsRecyclerViewadapter.kt
@@ -81,8 +81,8 @@ class ComponentListViewHolder(
 
 class ComponentHeaderViewHolder(private val binding: ComponentHeaderLayoutBinding) :
   RecyclerView.ViewHolder(binding.root), ComponentViewHolder {
-  override fun bind(viewItem: ComponentListViewModel.ViewItem) {
-    val headerItem = viewItem as ComponentListViewModel.ViewItem.HeaderItem
+  override fun bind(component: ComponentListViewModel.ViewItem) {
+    val headerItem = component as ComponentListViewModel.ViewItem.HeaderItem
     binding.tvComponentHeader.text =
       binding.tvComponentHeader.context.getString(headerItem.header.textId)
   }
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/CustomNumberPickerFactory.kt b/catalog/src/main/java/com/google/android/fhir/catalog/CustomNumberPickerFactory.kt
index 83e6d58889..1aa2c21000 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/CustomNumberPickerFactory.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/CustomNumberPickerFactory.kt
@@ -18,16 +18,16 @@ package com.google.android.fhir.catalog
 
 import android.view.View
 import android.widget.NumberPicker
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderDelegate
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 
 object CustomNumberPickerFactory :
   QuestionnaireItemViewHolderFactory(R.layout.custom_number_picker_layout) {
   override fun getQuestionnaireItemViewHolderDelegate(): QuestionnaireItemViewHolderDelegate =
     object : QuestionnaireItemViewHolderDelegate {
       private lateinit var numberPicker: NumberPicker
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         /**
@@ -37,7 +37,7 @@ object CustomNumberPickerFactory :
         numberPicker = itemView.findViewById(R.id.number_picker)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         numberPicker.minValue = 1
         numberPicker.maxValue = 100
       }
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/CustomQuestionnaireFragment.kt b/catalog/src/main/java/com/google/android/fhir/catalog/CustomQuestionnaireFragment.kt
index 92aa9181f3..9d78a1be48 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/CustomQuestionnaireFragment.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/CustomQuestionnaireFragment.kt
@@ -17,7 +17,7 @@
 package com.google.android.fhir.catalog
 
 import com.google.android.fhir.datacapture.QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher
-import com.google.android.fhir.datacapture.contrib.views.barcode.QuestionnaireItemBarCodeReaderViewHolderFactory
+import com.google.android.fhir.datacapture.contrib.views.barcode.BarCodeReaderViewHolderFactory
 
 // TODO Remove this file and move this code to maybe a custom view in catalog app?
 class CustomQuestionnaireFragment /*: QuestionnaireFragment()*/ {
@@ -29,14 +29,12 @@ class CustomQuestionnaireFragment /*: QuestionnaireFragment()*/ {
           if (it == null) false else it.value.toString() == CustomNumberPickerFactory.WIDGET_TYPE
         }
       },
-      QuestionnaireItemViewHolderFactoryMatcher(QuestionnaireItemBarCodeReaderViewHolderFactory) {
-        questionnaireItem ->
-        questionnaireItem
-          .getExtensionByUrl(QuestionnaireItemBarCodeReaderViewHolderFactory.WIDGET_EXTENSION)
-          .let {
-            if (it == null) false
-            else it.value.toString() == QuestionnaireItemBarCodeReaderViewHolderFactory.WIDGET_TYPE
-          }
+      QuestionnaireItemViewHolderFactoryMatcher(BarCodeReaderViewHolderFactory) { questionnaireItem
+        ->
+        questionnaireItem.getExtensionByUrl(BarCodeReaderViewHolderFactory.WIDGET_EXTENSION).let {
+          if (it == null) false
+          else it.value.toString() == BarCodeReaderViewHolderFactory.WIDGET_TYPE
+        }
       }
     )
   }
diff --git a/contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest.kt b/contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactoryInstrumentedTest.kt
similarity index 90%
rename from contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest.kt
rename to contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactoryInstrumentedTest.kt
index 552a88495c..8b701bdcac 100644
--- a/contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest.kt
+++ b/contrib/barcode/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactoryInstrumentedTest.kt
@@ -24,8 +24,8 @@ import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolder
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -35,7 +35,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
+class BarCodeReaderViewHolderFactoryInstrumentedTest {
 
   private lateinit var context: ContextThemeWrapper
   private lateinit var parent: FrameLayout
@@ -49,13 +49,13 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
         R.style.Theme_MaterialComponents
       )
     parent = FrameLayout(context)
-    viewHolder = QuestionnaireItemBarCodeReaderViewHolderFactory.create(parent)
+    viewHolder = BarCodeReaderViewHolderFactory.create(parent)
   }
 
   @Test
   fun shouldShowPrefixText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { prefix = "Prefix?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -72,7 +72,7 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
   @Test
   fun shouldHidePrefixText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { prefix = "" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -87,7 +87,7 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
   @Test
   fun shouldSetTextViewText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -104,7 +104,7 @@ class QuestionnaireItemBarCodeReaderViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
diff --git a/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactory.kt b/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
similarity index 75%
rename from contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactory.kt
rename to contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
index 4f0c6b7367..154a5336be 100644
--- a/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/QuestionnaireItemBarCodeReaderViewHolderFactory.kt
+++ b/contrib/barcode/src/main/java/com/google/android/fhir/datacapture/contrib/views/barcode/BarCodeReaderViewHolderFactory.kt
@@ -22,14 +22,14 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.contrib.views.barcode.mlkit.md.LiveBarcodeScanningFragment
 import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderDelegate
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.tryUnwrapContext
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 
-object QuestionnaireItemBarCodeReaderViewHolderFactory :
+object BarCodeReaderViewHolderFactory :
   QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_bar_code_reader_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
@@ -37,7 +37,7 @@ object QuestionnaireItemBarCodeReaderViewHolderFactory :
       private lateinit var textQuestion: TextView
       private lateinit var barcodeTextView: TextView
       private lateinit var reScanView: TextView
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         prefixTextView = itemView.findViewById(R.id.prefix)
@@ -69,31 +69,31 @@ object QuestionnaireItemBarCodeReaderViewHolderFactory :
               }
 
             if (answer == null) {
-              questionnaireItemViewItem.clearAnswer()
+              questionnaireViewItem.clearAnswer()
             } else {
-              questionnaireItemViewItem.setAnswer(answer)
+              questionnaireViewItem.setAnswer(answer)
             }
 
-            setInitial(questionnaireItemViewItem.answers.singleOrNull(), reScanView)
+            setInitial(questionnaireViewItem.answers.singleOrNull(), reScanView)
           }
           LiveBarcodeScanningFragment()
             .show(
               context.supportFragmentManager,
-              QuestionnaireItemBarCodeReaderViewHolderFactory.javaClass.simpleName
+              BarCodeReaderViewHolderFactory.javaClass.simpleName
             )
         }
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        this.questionnaireItemViewItem = questionnaireItemViewItem
-        if (!questionnaireItemViewItem.questionnaireItem.prefix.isNullOrEmpty()) {
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        this.questionnaireViewItem = questionnaireViewItem
+        if (!questionnaireViewItem.questionnaireItem.prefix.isNullOrEmpty()) {
           prefixTextView.visibility = View.VISIBLE
-          prefixTextView.text = questionnaireItemViewItem.questionnaireItem.localizedPrefixSpanned
+          prefixTextView.text = questionnaireViewItem.questionnaireItem.localizedPrefixSpanned
         } else {
           prefixTextView.visibility = View.GONE
         }
-        textQuestion.text = questionnaireItemViewItem.questionnaireItem.localizedTextSpanned
-        setInitial(questionnaireItemViewItem.answers.singleOrNull(), reScanView)
+        textQuestion.text = questionnaireViewItem.questionnaireItem.localizedTextSpanned
+        setInitial(questionnaireViewItem.answers.singleOrNull(), reScanView)
       }
 
       private fun setInitial(
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
index b5d551ac28..af65495c5b 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -32,7 +32,7 @@ import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.Q
 import com.google.android.fhir.datacapture.test.R
 import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.utilities.clickOnText
-import com.google.android.fhir.datacapture.views.localDateTime
+import com.google.android.fhir.datacapture.views.factories.localDateTime
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import java.time.LocalDateTime
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
similarity index 83%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
index 5c04b3a627..518a9154b0 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactoryInstrumentedTest.kt
@@ -22,13 +22,13 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.google.android.fhir.datacapture.QuestionnaireItemEditAdapter
-import com.google.android.fhir.datacapture.QuestionnaireItemViewHolderType
+import com.google.android.fhir.datacapture.QuestionnaireEditAdapter
+import com.google.android.fhir.datacapture.QuestionnaireViewHolderType
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolder
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -42,11 +42,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
+class PhoneNumberViewHolderFactoryInstrumentedTest {
   private lateinit var context: ContextThemeWrapper
   private lateinit var parent: FrameLayout
   private lateinit var viewHolder: QuestionnaireItemViewHolder
-  private lateinit var questionnaireItemEditAdapter: QuestionnaireItemEditAdapter
+  private lateinit var questionnaireEditAdapter: QuestionnaireEditAdapter
 
   @Before
   fun setUp() {
@@ -56,18 +56,18 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
         R.style.Theme_Material3_DayNight
       )
     parent = FrameLayout(context)
-    viewHolder = QuestionnaireItemPhoneNumberViewHolderFactory.create(parent)
-    questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    viewHolder = PhoneNumberViewHolderFactory.create(parent)
+    questionnaireEditAdapter = QuestionnaireEditAdapter()
   }
 
   @Test
   fun createViewHolder_shouldReturn_phoneNumberViewHolder() {
     val viewHolderFromAdapter =
-      questionnaireItemEditAdapter.createViewHolder(
+      questionnaireEditAdapter.createViewHolder(
         parent,
-        QuestionnaireItemEditAdapter.ViewType.from(
-            type = QuestionnaireItemEditAdapter.ViewType.Type.QUESTION,
-            subtype = QuestionnaireItemViewHolderType.PHONE_NUMBER.value,
+        QuestionnaireEditAdapter.ViewType.from(
+            type = QuestionnaireEditAdapter.ViewType.Type.QUESTION,
+            subtype = QuestionnaireViewHolderType.PHONE_NUMBER.value,
           )
           .viewType,
       )
@@ -77,7 +77,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @Test
   fun shouldSetTextViewText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -92,7 +92,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -117,7 +117,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -130,7 +130,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -150,42 +150,42 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   @Ignore("https://github.com/google/android-fhir/issues/1494")
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView
       .findViewById<TextInputEditText>(R.id.text_input_edit_text)
       .setText("+12345678910")
-    assertThat(questionnaireItemViewItem.answers.single().valueStringType.value)
+    assertThat(questionnaireViewItem.answers.single().valueStringType.value)
       .isEqualTo("+12345678910")
   }
 
   @Test
   @UiThreadTest
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
   @Test
   @UiThreadTest
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minLength"
@@ -212,7 +212,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { maxLength = 10 },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -236,7 +236,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/AttachmentViewHolderFactoryEspressoTest.kt
similarity index 96%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactoryEspressoTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/AttachmentViewHolderFactoryEspressoTest.kt
index 7fe80d8cf8..47e5f03b1b 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/AttachmentViewHolderFactoryEspressoTest.kt
@@ -28,6 +28,8 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.CodeType
@@ -39,7 +41,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
+class AttachmentViewHolderFactoryEspressoTest {
 
   @Rule
   @JvmField
@@ -52,14 +54,14 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Before
   fun setup() {
     activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = QuestionnaireItemAttachmentViewHolderFactory.create(parent)
+    viewHolder = AttachmentViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
   @Test
   fun shouldDisplayTakePhotoAndUploadPhotoButton() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -86,7 +88,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayUploadAudioButton() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -110,7 +112,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayUploadVideoButton() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -134,7 +136,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayUploadDocumentButton() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -158,7 +160,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayTakePhotoAndUploadFileButton() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -189,7 +191,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayImagePreviewFromAnswer() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -227,7 +229,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayAudioFilePreviewFromAnswer() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -266,7 +268,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayVideoFilePreviewFromAnswer() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -305,7 +307,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun shouldDisplayDocumentFilePreviewFromAnswer() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -344,7 +346,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun doNotShowPreviewIfAnswerDoesNotHaveAttachment() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -372,7 +374,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
   @Test
   fun doNotShowPreviewOfPreviousAnswerAttachmentForCurrentAnswerItem() {
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
@@ -409,7 +411,7 @@ class QuestionnaireItemAttachmentViewHolderFactoryEspressoTest {
       .isEqualTo(View.VISIBLE)
 
     val questionnaireItemWithNullAnswer =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/mimeType"
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt
similarity index 95%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryEspressoTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt
index 114d4dcc66..814f24199e 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt
@@ -36,6 +36,8 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseItemValidator
 import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.datacapture.views.factories.DatePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import java.util.Calendar
@@ -53,7 +55,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
+class DatePickerViewHolderFactoryEspressoTest {
 
   @Rule
   @JvmField
@@ -66,7 +68,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   fun setup() {
     Locale.setDefault(Locale.US)
     activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = QuestionnaireItemDatePickerViewHolderFactory.create(parent)
+    viewHolder = DatePickerViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
@@ -74,7 +76,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   fun shouldSetDateInput() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -98,7 +100,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   fun shouldSetDateInput_withinRange() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -139,7 +141,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetDateInput_invalid_date_entry_invalid_month_day_year() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -158,7 +160,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetDateInput_invalid_date_entry_invalid_day() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -177,7 +179,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetDateInput_invalid_date_entry_invalid_month() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -196,7 +198,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetDateInput_invalid_date_entry_invalid_year() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -216,7 +218,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val maxDate = DateType(Date()).apply { add(Calendar.YEAR, -2) }
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -258,7 +260,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val minDate = DateType(Date()).apply { add(Calendar.YEAR, 1) }
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -298,7 +300,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryEspressoTest {
   @Test
   fun shouldThrowException_whenMinValueRangeIsGreaterThanMaxValueRange() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DateTimePickerViewHolderFactoryEspressoTest.kt
similarity index 92%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DateTimePickerViewHolderFactoryEspressoTest.kt
index 433e7ed78f..570308552b 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DateTimePickerViewHolderFactoryEspressoTest.kt
@@ -32,6 +32,8 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.DateTimePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import org.hamcrest.CoreMatchers.allOf
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -41,7 +43,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
+class DateTimePickerViewHolderFactoryEspressoTest {
 
   @Rule
   @JvmField
@@ -53,14 +55,14 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
   @Before
   fun setup() {
     activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = QuestionnaireItemDateTimePickerViewHolderFactory.create(parent)
+    viewHolder = DateTimePickerViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
   @Test
   fun showsTimePickerInInputMode() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -83,7 +85,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryEspressoTest {
   @Test
   fun showsTimePickerInClockMode() {
     val questionnaireItemView =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DropDownViewHolderFactoryEspressoTest.kt
similarity index 96%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DropDownViewHolderFactoryEspressoTest.kt
index 6c250f26a9..5b5e4bc4be 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DropDownViewHolderFactoryEspressoTest.kt
@@ -34,6 +34,8 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.utilities.showDropDown
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.DropDownViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Attachment
@@ -46,7 +48,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
+class DropDownViewHolderFactoryEspressoTest {
   @Rule
   @JvmField
   var activityScenarioRule: ActivityScenarioRule<TestActivity> =
@@ -69,39 +71,39 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
   @Before
   fun setup() {
     activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = QuestionnaireItemDropDownViewHolderFactory.create(parent)
+    viewHolder = DropDownViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
   @Test
   fun shouldClearAutoCompleteTextView() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions("Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withText("-")).inRoot(isPlatformPopup()).check(matches(isDisplayed())).perform(click())
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.auto_complete).text.toString())
       .isEqualTo("-")
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun shouldSetDropDownValueToAutoCompleteTextView() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions("Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withText("Coding 3"))
@@ -116,14 +118,14 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
   @Test
   fun shouldClearAutoCompleteTextViewOnRebindingView() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions("Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withText("Coding 3"))
@@ -133,7 +135,7 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.auto_complete).text.toString())
       .isEqualTo("Coding 3")
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
     assertThat(viewHolder.itemView.findViewById<TextView>(R.id.auto_complete).text.toString())
       .isEqualTo("")
     val autoCompleteTextView =
@@ -147,8 +149,8 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetImageToAutoCompleteTextViewOnItemSelection() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         createAnswerOptions(
           "Coding 1",
           "Coding 2",
@@ -161,7 +163,7 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withText("Coding 3"))
@@ -181,14 +183,14 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
   @Test
   fun shouldSetDropDownValueStringToAutoCompleteTextView() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         createAnswerOptions("Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseValueStringOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withText("Coding 1"))
@@ -202,14 +204,14 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
 
   @Test
   fun shouldReturnNonFilteredDropDownMenuItems() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         createAnswerOptions("Coding 1", "Coding 2", "Coding 3", "Add", "Subtract"),
         responseValueStringOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     assertThat(
@@ -221,14 +223,14 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
   }
   @Test
   fun shouldReturnFilteredDropDownMenuItems() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         createAnswerOptions("Coding 1", "Coding 2", "Coding 3", "Add", "Subtract"),
         responseValueStringOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withId(R.id.auto_complete)).perform(typeText("Coding"))
@@ -242,14 +244,14 @@ class QuestionnaireItemDropDownViewHolderFactoryEspressoTest {
 
   @Test
   fun shouldReturnFilteredWithNoResultsDropDownMenuItems() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         createAnswerOptions("Coding 1", "Coding 2", "Coding 3", "Add", "Subtract"),
         responseValueStringOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.auto_complete)).perform(showDropDown())
     onView(withId(R.id.auto_complete)).perform(typeText("Division"))
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaViewInstrumentedTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/MediaViewInstrumentedTest.kt
similarity index 97%
rename from datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaViewInstrumentedTest.kt
rename to datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/MediaViewInstrumentedTest.kt
index 1d121f1fdd..a4e3eb96fa 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaViewInstrumentedTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/MediaViewInstrumentedTest.kt
@@ -37,7 +37,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class QuestionnaireItemMediaViewInstrumentedTest {
+class MediaViewInstrumentedTest {
 
   @Rule
   @JvmField
@@ -45,12 +45,12 @@ class QuestionnaireItemMediaViewInstrumentedTest {
     ActivityScenarioRule(TestActivity::class.java)
 
   private lateinit var parent: FrameLayout
-  private lateinit var view: QuestionnaireItemMediaView
+  private lateinit var view: MediaView
 
   @Before
   fun setUp() {
     activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
-    view = QuestionnaireItemMediaView(parent.context, null)
+    view = MediaView(parent.context, null)
     setTestLayout(view)
   }
 
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
index 41e321b220..23f1726d91 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest.kt
@@ -42,6 +42,8 @@ import com.google.android.fhir.datacapture.utilities.clickOnText
 import com.google.android.fhir.datacapture.utilities.clickOnTextInDialog
 import com.google.android.fhir.datacapture.utilities.endIconClickInTextInputLayout
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.StringSubject
 import com.google.common.truth.Truth.assertThat
@@ -74,15 +76,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
   @Test
   fun multipleChoice_selectMultiple_clickSave_shouldSaveMultipleOptions() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(true, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Coding 1")
@@ -96,34 +98,34 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
 
   @Test
   fun multipleChoice_SelectNothing_clickSave_shouldSaveNothing() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(true, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Save")
 
     assertDisplayedText().isEmpty()
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun multipleChoice_selectMultiple_clickCancel_shouldSaveNothing() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(true, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Coding 3")
@@ -131,21 +133,21 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
     clickOnText("Cancel")
 
     assertDisplayedText().isEmpty()
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun shouldSelectSingleOptionOnChangeInOptionFromDropDown() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Coding 2")
@@ -159,15 +161,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
   @Test
   fun singleOption_select_clickSave_shouldSaveSingleOption() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Coding 2")
@@ -179,27 +181,27 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
 
   @Test
   fun singleOption_selectNothing_clickSave_shouldSaveNothing() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Save")
 
     assertDisplayedText().isEmpty()
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun bindView_setHintText() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5")
           .addItem(
             Questionnaire.QuestionnaireItemComponent().apply {
@@ -224,7 +226,7 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     assertThat(
         viewHolder.itemView
@@ -236,21 +238,21 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
 
   @Test
   fun singleOption_select_clickCancel_shouldSaveNothing() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     clickOnTextInDialog("Coding 2")
     clickOnText("Cancel")
 
     assertDisplayedText().isEmpty()
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
@@ -268,15 +270,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
         "Coding 8"
       )
     questionnaireItem.addExtension(openChoiceType)
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         questionnaireItem,
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     onView(withId(R.id.recycler_view))
@@ -300,15 +302,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
         "Coding 8"
       )
     questionnaireItem.addExtension(openChoiceType)
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         questionnaireItem,
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     onView(withId(R.id.recycler_view))
@@ -333,15 +335,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
         "Coding 8"
       )
     questionnaireItem.addExtension(openChoiceType)
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         questionnaireItem,
         responseOptions(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     endIconClickInTextInputLayout(R.id.multi_select_summary_holder)
     onView(withId(R.id.recycler_view))
@@ -355,15 +357,15 @@ class QuestionnaireItemDialogMultiSelectViewHolderFactoryEspressoTest {
   fun `shouldHideErrorTextviewInHeader`() {
     val questionnaireItem = answerOptions(true, "Coding 1")
     questionnaireItem.addExtension(openChoiceType)
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         questionnaireItem,
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.error_text_at_header)).check(matches(not(isDisplayed())))
   }
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
index 0e7590a007..da7a5ecd4f 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest.kt
@@ -28,6 +28,8 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.EditTextQuantityViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.common.truth.Truth.assertThat
 import java.math.BigDecimal
 import org.hl7.fhir.r4.model.Quantity
@@ -49,15 +51,15 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest {
   @Before
   fun setup() {
     activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = QuestionnaireItemEditTextQuantityViewHolderFactory.create(parent)
+    viewHolder = EditTextQuantityViewHolderFactory.create(parent)
     setTestLayout(viewHolder.itemView)
   }
 
   @Test
   fun getValue_WithInitial_shouldReturn_Quantity_With_UnitAndSystem() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addInitial(
@@ -73,7 +75,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.text_input_edit_text)).perform(click())
     onView(withId(R.id.text_input_edit_text)).perform(typeText("22"))
@@ -91,14 +93,14 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryEspressoTest {
   @Test
   fun getValue_WithoutInitial_shouldReturn_Quantity_Without_UnitAndSystem() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    runOnUI { viewHolder.bind(questionnaireItemViewItem) }
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
 
     onView(withId(R.id.text_input_edit_text)).perform(click())
     onView(withId(R.id.text_input_edit_text)).perform(typeText("22"))
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt
index 3ec074637f..8a3a2490c7 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt
@@ -25,6 +25,8 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.TestActivity
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Coding
@@ -41,7 +43,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
   @Test
   fun emptyResponseOptions_showNoneSelected() = withViewHolder { holder ->
     holder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         answerOptions("Coding 1", "Coding 2"),
         responseOptions(),
         validationResult = NotValidated,
@@ -55,7 +57,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
   @Test
   fun selectedResponseOptions_showSelectedOptions() = withViewHolder { holder ->
     holder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         answerOptions("Coding 1", "Coding 2", "Coding 3"),
         responseOptions("Coding 1", "Coding 3"),
         validationResult = NotValidated,
@@ -70,7 +72,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun displayValidationResult_error_shouldShowErrorMessage() = withViewHolder { viewHolder ->
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "1"
           required = true
@@ -91,7 +93,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
   @UiThreadTest
   fun displayValidationResult_noError_shouldShowNoErrorMessage() = withViewHolder { viewHolder ->
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "1"
           required = true
@@ -122,7 +124,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
   @Test
   fun bind_readOnly_shouldDisableView() = withViewHolder { holder ->
     holder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "1"
           readOnly = true
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
index 6309e18dea..66d0a77da7 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireAdapterItem.kt
@@ -16,10 +16,10 @@
 
 package com.google.android.fhir.datacapture
 
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 
 /** Various types of rows that can be used in a Questionnaire RecyclerView. */
 internal sealed interface QuestionnaireAdapterItem {
-  /** A row for a quesion in a Questionnaire RecyclerView. */
-  data class Question(val item: QuestionnaireItemViewItem) : QuestionnaireAdapterItem
+  /** A row for a question in a Questionnaire RecyclerView. */
+  data class Question(val item: QuestionnaireViewItem) : QuestionnaireAdapterItem
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
similarity index 51%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapter.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
index 9732bdef06..077ddb6f43 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapter.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapter.kt
@@ -19,36 +19,36 @@ package com.google.android.fhir.datacapture
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
-import com.google.android.fhir.datacapture.contrib.views.QuestionnaireItemPhoneNumberViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemAttachmentViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemAutoCompleteViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemBooleanTypePickerViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemCheckBoxGroupViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDatePickerViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDateTimePickerViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDialogSelectViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDisplayViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDropDownViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextDecimalViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextIntegerViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextMultiLineViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextQuantityViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextSingleLineViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemGroupViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemRadioGroupViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemSliderViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolder
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.contrib.views.PhoneNumberViewHolderFactory
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.AutoCompleteViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.BooleanChoiceViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.CheckBoxGroupViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.DatePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.DateTimePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.DisplayViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.DropDownViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.EditTextDecimalViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.EditTextIntegerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.EditTextMultiLineViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.EditTextQuantityViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.EditTextSingleLineViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.GroupViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
+import com.google.android.fhir.datacapture.views.factories.RadioGroupViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.SliderViewHolderFactory
 import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType
 
-internal class QuestionnaireItemEditAdapter(
+internal class QuestionnaireEditAdapter(
   private val questionnaireItemViewHolderMatchers:
     List<QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher> =
     emptyList(),
 ) : ListAdapter<QuestionnaireAdapterItem, QuestionnaireItemViewHolder>(DiffCallbacks.ITEMS) {
   /**
-   * @param viewType the integer value of the [QuestionnaireItemViewHolderType] used to render the
-   * [QuestionnaireItemViewItem].
+   * @param viewType the integer value of the [QuestionnaireViewHolderType] used to render the
+   * [QuestionnaireViewItem].
    */
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionnaireItemViewHolder {
     val typedViewType = ViewType.parse(viewType)
@@ -62,7 +62,7 @@ internal class QuestionnaireItemEditAdapter(
     parent: ViewGroup,
     subtype: Int,
   ): QuestionnaireItemViewHolder {
-    val numOfCanonicalWidgets = QuestionnaireItemViewHolderType.values().size
+    val numOfCanonicalWidgets = QuestionnaireViewHolderType.values().size
     check(subtype < numOfCanonicalWidgets + questionnaireItemViewHolderMatchers.size) {
       "Invalid widget type specified. Widget Int type cannot exceed the total number of supported custom and canonical widgets"
     }
@@ -73,36 +73,25 @@ internal class QuestionnaireItemEditAdapter(
         .factory.create(parent)
 
     val viewHolderFactory =
-      when (QuestionnaireItemViewHolderType.fromInt(subtype)) {
-        QuestionnaireItemViewHolderType.GROUP -> QuestionnaireItemGroupViewHolderFactory
-        QuestionnaireItemViewHolderType.BOOLEAN_TYPE_PICKER ->
-          QuestionnaireItemBooleanTypePickerViewHolderFactory
-        QuestionnaireItemViewHolderType.DATE_PICKER -> QuestionnaireItemDatePickerViewHolderFactory
-        QuestionnaireItemViewHolderType.DATE_TIME_PICKER ->
-          QuestionnaireItemDateTimePickerViewHolderFactory
-        QuestionnaireItemViewHolderType.EDIT_TEXT_SINGLE_LINE ->
-          QuestionnaireItemEditTextSingleLineViewHolderFactory
-        QuestionnaireItemViewHolderType.EDIT_TEXT_MULTI_LINE ->
-          QuestionnaireItemEditTextMultiLineViewHolderFactory
-        QuestionnaireItemViewHolderType.EDIT_TEXT_INTEGER ->
-          QuestionnaireItemEditTextIntegerViewHolderFactory
-        QuestionnaireItemViewHolderType.EDIT_TEXT_DECIMAL ->
-          QuestionnaireItemEditTextDecimalViewHolderFactory
-        QuestionnaireItemViewHolderType.RADIO_GROUP -> QuestionnaireItemRadioGroupViewHolderFactory
-        QuestionnaireItemViewHolderType.DROP_DOWN -> QuestionnaireItemDropDownViewHolderFactory
-        QuestionnaireItemViewHolderType.DISPLAY -> QuestionnaireItemDisplayViewHolderFactory
-        QuestionnaireItemViewHolderType.QUANTITY ->
-          QuestionnaireItemEditTextQuantityViewHolderFactory
-        QuestionnaireItemViewHolderType.CHECK_BOX_GROUP ->
-          QuestionnaireItemCheckBoxGroupViewHolderFactory
-        QuestionnaireItemViewHolderType.AUTO_COMPLETE ->
-          QuestionnaireItemAutoCompleteViewHolderFactory
-        QuestionnaireItemViewHolderType.DIALOG_SELECT ->
-          QuestionnaireItemDialogSelectViewHolderFactory
-        QuestionnaireItemViewHolderType.SLIDER -> QuestionnaireItemSliderViewHolderFactory
-        QuestionnaireItemViewHolderType.PHONE_NUMBER ->
-          QuestionnaireItemPhoneNumberViewHolderFactory
-        QuestionnaireItemViewHolderType.ATTACHMENT -> QuestionnaireItemAttachmentViewHolderFactory
+      when (QuestionnaireViewHolderType.fromInt(subtype)) {
+        QuestionnaireViewHolderType.GROUP -> GroupViewHolderFactory
+        QuestionnaireViewHolderType.BOOLEAN_TYPE_PICKER -> BooleanChoiceViewHolderFactory
+        QuestionnaireViewHolderType.DATE_PICKER -> DatePickerViewHolderFactory
+        QuestionnaireViewHolderType.DATE_TIME_PICKER -> DateTimePickerViewHolderFactory
+        QuestionnaireViewHolderType.EDIT_TEXT_SINGLE_LINE -> EditTextSingleLineViewHolderFactory
+        QuestionnaireViewHolderType.EDIT_TEXT_MULTI_LINE -> EditTextMultiLineViewHolderFactory
+        QuestionnaireViewHolderType.EDIT_TEXT_INTEGER -> EditTextIntegerViewHolderFactory
+        QuestionnaireViewHolderType.EDIT_TEXT_DECIMAL -> EditTextDecimalViewHolderFactory
+        QuestionnaireViewHolderType.RADIO_GROUP -> RadioGroupViewHolderFactory
+        QuestionnaireViewHolderType.DROP_DOWN -> DropDownViewHolderFactory
+        QuestionnaireViewHolderType.DISPLAY -> DisplayViewHolderFactory
+        QuestionnaireViewHolderType.QUANTITY -> EditTextQuantityViewHolderFactory
+        QuestionnaireViewHolderType.CHECK_BOX_GROUP -> CheckBoxGroupViewHolderFactory
+        QuestionnaireViewHolderType.AUTO_COMPLETE -> AutoCompleteViewHolderFactory
+        QuestionnaireViewHolderType.DIALOG_SELECT -> QuestionnaireItemDialogSelectViewHolderFactory
+        QuestionnaireViewHolderType.SLIDER -> SliderViewHolderFactory
+        QuestionnaireViewHolderType.PHONE_NUMBER -> PhoneNumberViewHolderFactory
+        QuestionnaireViewHolderType.ATTACHMENT -> AttachmentViewHolderFactory
       }
     return viewHolderFactory.create(parent)
   }
@@ -161,90 +150,90 @@ internal class QuestionnaireItemEditAdapter(
   }
 
   /**
-   * Returns the integer value of the [QuestionnaireItemViewHolderType] that will be used to render
-   * the [QuestionnaireItemViewItem]. This is determined by a combination of the data type of the
-   * question and any additional Questionnaire Item UI Control Codes
+   * Returns the integer value of the [QuestionnaireViewHolderType] that will be used to render the
+   * [QuestionnaireViewItem]. This is determined by a combination of the data type of the question
+   * and any additional Questionnaire Item UI Control Codes
    * (http://hl7.org/fhir/R4/valueset-questionnaire-item-control.html) used in the itemControl
    * extension (http://hl7.org/fhir/R4/extension-questionnaire-itemcontrol.html).
    */
   internal fun getItemViewTypeForQuestion(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
+    questionnaireViewItem: QuestionnaireViewItem,
   ): Int {
-    val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+    val questionnaireItem = questionnaireViewItem.questionnaireItem
     // For custom widgets, generate an int value that's greater than any int assigned to the
     // canonical FHIR widgets
     questionnaireItemViewHolderMatchers.forEachIndexed { index, matcher ->
       if (matcher.matches(questionnaireItem)) {
-        return index + QuestionnaireItemViewHolderType.values().size
+        return index + QuestionnaireViewHolderType.values().size
       }
     }
 
-    if (questionnaireItemViewItem.answerOption.isNotEmpty()) {
-      return getChoiceViewHolderType(questionnaireItemViewItem).value
+    if (questionnaireViewItem.answerOption.isNotEmpty()) {
+      return getChoiceViewHolderType(questionnaireViewItem).value
     }
 
     return when (val type = questionnaireItem.type) {
-      QuestionnaireItemType.GROUP -> QuestionnaireItemViewHolderType.GROUP
-      QuestionnaireItemType.BOOLEAN -> QuestionnaireItemViewHolderType.BOOLEAN_TYPE_PICKER
-      QuestionnaireItemType.DATE -> QuestionnaireItemViewHolderType.DATE_PICKER
-      QuestionnaireItemType.DATETIME -> QuestionnaireItemViewHolderType.DATE_TIME_PICKER
-      QuestionnaireItemType.STRING -> getStringViewHolderType(questionnaireItemViewItem)
-      QuestionnaireItemType.TEXT -> QuestionnaireItemViewHolderType.EDIT_TEXT_MULTI_LINE
-      QuestionnaireItemType.INTEGER -> getIntegerViewHolderType(questionnaireItemViewItem)
-      QuestionnaireItemType.DECIMAL -> QuestionnaireItemViewHolderType.EDIT_TEXT_DECIMAL
-      QuestionnaireItemType.CHOICE -> getChoiceViewHolderType(questionnaireItemViewItem)
-      QuestionnaireItemType.DISPLAY -> QuestionnaireItemViewHolderType.DISPLAY
-      QuestionnaireItemType.QUANTITY -> QuestionnaireItemViewHolderType.QUANTITY
-      QuestionnaireItemType.REFERENCE -> getChoiceViewHolderType(questionnaireItemViewItem)
-      QuestionnaireItemType.ATTACHMENT -> QuestionnaireItemViewHolderType.ATTACHMENT
+      QuestionnaireItemType.GROUP -> QuestionnaireViewHolderType.GROUP
+      QuestionnaireItemType.BOOLEAN -> QuestionnaireViewHolderType.BOOLEAN_TYPE_PICKER
+      QuestionnaireItemType.DATE -> QuestionnaireViewHolderType.DATE_PICKER
+      QuestionnaireItemType.DATETIME -> QuestionnaireViewHolderType.DATE_TIME_PICKER
+      QuestionnaireItemType.STRING -> getStringViewHolderType(questionnaireViewItem)
+      QuestionnaireItemType.TEXT -> QuestionnaireViewHolderType.EDIT_TEXT_MULTI_LINE
+      QuestionnaireItemType.INTEGER -> getIntegerViewHolderType(questionnaireViewItem)
+      QuestionnaireItemType.DECIMAL -> QuestionnaireViewHolderType.EDIT_TEXT_DECIMAL
+      QuestionnaireItemType.CHOICE -> getChoiceViewHolderType(questionnaireViewItem)
+      QuestionnaireItemType.DISPLAY -> QuestionnaireViewHolderType.DISPLAY
+      QuestionnaireItemType.QUANTITY -> QuestionnaireViewHolderType.QUANTITY
+      QuestionnaireItemType.REFERENCE -> getChoiceViewHolderType(questionnaireViewItem)
+      QuestionnaireItemType.ATTACHMENT -> QuestionnaireViewHolderType.ATTACHMENT
       else -> throw NotImplementedError("Question type $type not supported.")
     }.value
   }
 
   private fun getChoiceViewHolderType(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
-  ): QuestionnaireItemViewHolderType {
-    val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+    questionnaireViewItem: QuestionnaireViewItem,
+  ): QuestionnaireViewHolderType {
+    val questionnaireItem = questionnaireViewItem.questionnaireItem
 
     // Use the view type that the client wants if they specified an itemControl
     return questionnaireItem.itemControl?.viewHolderType
     // Otherwise, choose a sensible UI element automatically
     ?: run {
-        val numOptions = questionnaireItemViewItem.answerOption.size
+        val numOptions = questionnaireViewItem.answerOption.size
         when {
           // Always use a dialog for questions with a large number of options
           numOptions >= MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DIALOG ->
-            QuestionnaireItemViewHolderType.DIALOG_SELECT
+            QuestionnaireViewHolderType.DIALOG_SELECT
 
           // Use a check box group if repeated answers are permitted
-          questionnaireItem.repeats -> QuestionnaireItemViewHolderType.CHECK_BOX_GROUP
+          questionnaireItem.repeats -> QuestionnaireViewHolderType.CHECK_BOX_GROUP
 
           // Use a dropdown if there are a medium number of options
           numOptions >= MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN ->
-            QuestionnaireItemViewHolderType.DROP_DOWN
+            QuestionnaireViewHolderType.DROP_DOWN
 
           // Use a radio group only if there are a small number of options
-          else -> QuestionnaireItemViewHolderType.RADIO_GROUP
+          else -> QuestionnaireViewHolderType.RADIO_GROUP
         }
       }
   }
 
   private fun getIntegerViewHolderType(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
-  ): QuestionnaireItemViewHolderType {
-    val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+    questionnaireViewItem: QuestionnaireViewItem,
+  ): QuestionnaireViewHolderType {
+    val questionnaireItem = questionnaireViewItem.questionnaireItem
     // Use the view type that the client wants if they specified an itemControl
     return questionnaireItem.itemControl?.viewHolderType
-      ?: QuestionnaireItemViewHolderType.EDIT_TEXT_INTEGER
+      ?: QuestionnaireViewHolderType.EDIT_TEXT_INTEGER
   }
 
   private fun getStringViewHolderType(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
-  ): QuestionnaireItemViewHolderType {
-    val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+    questionnaireViewItem: QuestionnaireViewItem,
+  ): QuestionnaireViewHolderType {
+    val questionnaireItem = questionnaireViewItem.questionnaireItem
     // Use the view type that the client wants if they specified an itemControl
     return questionnaireItem.itemControl?.viewHolderType
-      ?: QuestionnaireItemViewHolderType.EDIT_TEXT_SINGLE_LINE
+      ?: QuestionnaireViewHolderType.EDIT_TEXT_SINGLE_LINE
   }
 
   internal companion object {
@@ -285,12 +274,12 @@ internal object DiffCallbacks {
   val QUESTIONS =
     object : DiffUtil.ItemCallback<QuestionnaireAdapterItem.Question>() {
       /**
-       * [QuestionnaireItemViewItem] is a transient object for the UI only. Whenever the user makes
-       * any change via the UI, a new list of [QuestionnaireItemViewItem]s will be created, each
-       * holding references to the underlying [QuestionnaireItem] and [QuestionnaireResponseItem],
-       * both of which should be read-only, and the current answers. To help recycler view handle
-       * update and/or animations, we consider two [QuestionnaireItemViewItem]s to be the same if
-       * they have the same underlying [QuestionnaireItem] and [QuestionnaireResponseItem].
+       * [QuestionnaireViewItem] is a transient object for the UI only. Whenever the user makes any
+       * change via the UI, a new list of [QuestionnaireViewItem]s will be created, each holding
+       * references to the underlying [QuestionnaireItem] and [QuestionnaireResponseItem], both of
+       * which should be read-only, and the current answers. To help recycler view handle update
+       * and/or animations, we consider two [QuestionnaireViewItem]s to be the same if they have the
+       * same underlying [QuestionnaireItem] and [QuestionnaireResponseItem].
        */
       override fun areItemsTheSame(
         oldItem: QuestionnaireAdapterItem.Question,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index cff7b49b33..1695c44de4 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -34,7 +34,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.validation.Invalid
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import org.hl7.fhir.r4.model.Questionnaire
 import timber.log.Timber
@@ -113,9 +113,9 @@ class QuestionnaireFragment : Fragment() {
     }
     val questionnaireProgressIndicator: LinearProgressIndicator =
       view.findViewById(R.id.questionnaire_progress_indicator)
-    val questionnaireItemEditAdapter =
-      QuestionnaireItemEditAdapter(questionnaireItemViewHolderFactoryMatchersProvider.get())
-    val questionnaireItemReviewAdapter = QuestionnaireItemReviewAdapter()
+    val questionnaireEditAdapter =
+      QuestionnaireEditAdapter(questionnaireItemViewHolderFactoryMatchersProvider.get())
+    val questionnaireReviewAdapter = QuestionnaireReviewAdapter()
 
     val submitButton = requireView().findViewById<Button>(R.id.submit_questionnaire)
 
@@ -125,13 +125,13 @@ class QuestionnaireFragment : Fragment() {
     val reviewModeButton = view.findViewById<View>(R.id.review_mode_button)
     reviewModeButton.setOnClickListener { viewModel.setReviewMode(true) }
 
-    questionnaireEditRecyclerView.adapter = questionnaireItemEditAdapter
+    questionnaireEditRecyclerView.adapter = questionnaireEditAdapter
     val linearLayoutManager = LinearLayoutManager(view.context)
     questionnaireEditRecyclerView.layoutManager = linearLayoutManager
     // Animation does work well with views that could gain focus
     questionnaireEditRecyclerView.itemAnimator = null
 
-    questionnaireReviewRecyclerView.adapter = questionnaireItemReviewAdapter
+    questionnaireReviewRecyclerView.adapter = questionnaireReviewAdapter
     questionnaireReviewRecyclerView.layoutManager = LinearLayoutManager(view.context)
 
     // Listen to updates from the view model.
@@ -141,7 +141,7 @@ class QuestionnaireFragment : Fragment() {
           is DisplayMode.ReviewMode -> {
             // Set items
             questionnaireEditRecyclerView.visibility = View.GONE
-            questionnaireItemReviewAdapter.submitList(
+            questionnaireReviewAdapter.submitList(
               state.items.filterIsInstance<QuestionnaireAdapterItem.Question>()
             )
             questionnaireReviewRecyclerView.visibility = View.VISIBLE
@@ -164,7 +164,7 @@ class QuestionnaireFragment : Fragment() {
           is DisplayMode.EditMode -> {
             // Set items
             questionnaireReviewRecyclerView.visibility = View.GONE
-            questionnaireItemEditAdapter.submitList(state.items)
+            questionnaireEditAdapter.submitList(state.items)
             questionnaireEditRecyclerView.visibility = View.VISIBLE
 
             // Set button visibility
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapter.kt
similarity index 78%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapter.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapter.kt
index be6094fe51..8be939ebc0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapter.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapter.kt
@@ -18,16 +18,16 @@ package com.google.android.fhir.datacapture
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.ListAdapter
-import com.google.android.fhir.datacapture.views.QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolder
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
+import com.google.android.fhir.datacapture.views.factories.ReviewViewHolderFactory
 
 /** List Adapter used to bind answers to [QuestionnaireItemViewHolder] in review mode. */
-internal class QuestionnaireItemReviewAdapter :
+internal class QuestionnaireReviewAdapter :
   ListAdapter<QuestionnaireAdapterItem.Question, QuestionnaireItemViewHolder>(
     DiffCallbacks.QUESTIONS
   ) {
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionnaireItemViewHolder {
-    return QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.create(parent)
+    return ReviewViewHolderFactory.create(parent)
   }
 
   override fun onBindViewHolder(holder: QuestionnaireItemViewHolder, position: Int) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderType.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderType.kt
similarity index 89%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderType.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderType.kt
index d2d4099cac..6f62a0b366 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderType.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderType.kt
@@ -19,14 +19,14 @@ package com.google.android.fhir.datacapture
 /**
  * Questionnaire item view holder types supported by default by the data capture library.
  *
- * This is used in [QuestionnaireItemEditAdapter] to determine how each [Questionnaire.Item] is
+ * This is used in [QuestionnaireEditAdapter] to determine how each [Questionnaire.Item] is
  * rendered.
  *
  * This list should provide sufficient coverage for values in
  * https://www.hl7.org/fhir/valueset-item-type.html and
  * http://hl7.org/fhir/R4/valueset-questionnaire-item-control.html.
  */
-internal enum class QuestionnaireItemViewHolderType(val value: Int) {
+internal enum class QuestionnaireViewHolderType(val value: Int) {
   GROUP(0),
   BOOLEAN_TYPE_PICKER(1),
   DATE_PICKER(2),
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
index c59c7ebe43..3076395d03 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -26,9 +26,12 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.datacapture.enablement.EnablementEvaluator
+import com.google.android.fhir.datacapture.extensions.EntryMode
+import com.google.android.fhir.datacapture.extensions.entryMode
+import com.google.android.fhir.datacapture.extensions.isPaginated
 import com.google.android.fhir.datacapture.fhirpath.ExpressionEvaluator.detectExpressionCyclicDependency
 import com.google.android.fhir.datacapture.fhirpath.ExpressionEvaluator.evaluateCalculatedExpressions
-import com.google.android.fhir.datacapture.utilities.fhirPathEngine
+import com.google.android.fhir.datacapture.fhirpath.fhirPathEngine
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseItemValidator
@@ -36,7 +39,7 @@ import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValid
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator.checkQuestionnaireResponse
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -229,7 +232,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
 
   /**
    * Callback function to update the view model after the answer(s) to a question have been changed.
-   * This is passed to the [QuestionnaireItemViewItem] in its constructor so that it can invoke this
+   * This is passed to the [QuestionnaireViewItem] in its constructor so that it can invoke this
    * callback function after the UI widget has updated the answer(s).
    *
    * This function updates the [QuestionnaireResponse] held in memory using the answer(s) provided
@@ -570,7 +573,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   }
 
   /**
-   * Returns the list of [QuestionnaireItemViewItem]s generated for the questionnaire items and
+   * Returns the list of [QuestionnaireViewItem]s generated for the questionnaire items and
    * questionnaire response items.
    */
   private fun getQuestionnaireAdapterItems(
@@ -585,7 +588,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   }
 
   /**
-   * Returns the list of [QuestionnaireItemViewItem]s generated for the questionnaire item and
+   * Returns the list of [QuestionnaireViewItem]s generated for the questionnaire item and
    * questionnaire response item.
    */
   private fun getQuestionnaireAdapterItems(
@@ -623,7 +626,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
       // Add an item for the question itself
       add(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItem,
             questionnaireResponseItem,
             validationResult = validationResult,
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
similarity index 68%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
index 334854d3fb..4e38036b3c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/contrib/views/PhoneNumberViewHolderFactory.kt
@@ -19,29 +19,26 @@ package com.google.android.fhir.datacapture.contrib.views
 import android.text.Editable
 import android.text.InputType
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextViewHolderDelegate
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderDelegate
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemEditTextViewHolderDelegate
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderDelegate
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 
-object QuestionnaireItemPhoneNumberViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_edit_text_single_line_view) {
+object PhoneNumberViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.edit_text_single_line_view) {
   override fun getQuestionnaireItemViewHolderDelegate(): QuestionnaireItemViewHolderDelegate =
     object : QuestionnaireItemEditTextViewHolderDelegate(InputType.TYPE_CLASS_PHONE) {
 
-      override fun handleInput(
-        editable: Editable,
-        questionnaireItemViewItem: QuestionnaireItemViewItem
-      ) {
+      override fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem) {
         val input = getValue(editable.toString())
         if (input != null) {
-          questionnaireItemViewItem.setAnswer(input)
+          questionnaireViewItem.setAnswer(input)
         } else {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
         }
       }
 
@@ -59,12 +56,12 @@ object QuestionnaireItemPhoneNumberViewHolderFactory :
       }
 
       override fun updateUI(
-        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
         textInputLayout: TextInputLayout,
       ) {
         val text =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueStringType?.value?.toString() ?: ""
+          questionnaireViewItem.answers.singleOrNull()?.valueStringType?.value?.toString() ?: ""
         if (text != textInputEditText.text.toString()) {
           textInputEditText.setText(text)
         }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
index cf3c4ce96a..9c647fc0ff 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt
@@ -19,7 +19,7 @@ package com.google.android.fhir.datacapture.enablement
 import com.google.android.fhir.compareTo
 import com.google.android.fhir.datacapture.allItems
 import com.google.android.fhir.datacapture.enableWhenExpression
-import com.google.android.fhir.datacapture.utilities.fhirPathEngine
+import com.google.android.fhir.datacapture.fhirpath.fhirPathEngine
 import com.google.android.fhir.equals
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreContexts.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreContexts.kt
similarity index 96%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreContexts.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreContexts.kt
index 9480450522..03255313fb 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreContexts.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreContexts.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreEnumeration.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreEnumerations.kt
similarity index 80%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreEnumeration.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreEnumerations.kt
index 74f5d7c7b1..03b6c867e2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreEnumeration.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreEnumerations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture
 
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Enumeration
@@ -52,3 +52,18 @@ internal fun Enumeration<*>.toCoding(): Coding {
       }
   }
 }
+
+/**
+ * Invokes function specified by [functionName] on the calling object with the provided arguments
+ * [args]
+ */
+internal fun Any.invokeFunction(
+  functionName: String,
+  parameterTypes: List<Class<*>> = listOf(),
+  vararg args: Any?
+): Any? =
+  this::class
+    .java
+    .getDeclaredMethod(functionName, *parameterTypes.toTypedArray())
+    .apply { isAccessible = true }
+    .invoke(this, *args)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreExpressions.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreExpressions.kt
similarity index 100%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreExpressions.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreExpressions.kt
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimes.kt
similarity index 95%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimes.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimes.kt
index 8c354c7684..4ec31d1fdf 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimes.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimes.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture
 
 import android.content.Context
 import android.text.format.DateFormat
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDates.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
similarity index 94%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDates.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
index cfb64814c0..1cc182abce 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalDates.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture
 
 import android.icu.text.DateFormat
 import android.icu.text.SimpleDateFormat
-import com.google.android.fhir.datacapture.views.length
-import com.google.android.fhir.datacapture.views.localDate
+import com.google.android.fhir.datacapture.views.factories.length
+import com.google.android.fhir.datacapture.views.factories.localDate
 import java.lang.Character.isLetter
-import java.lang.StringBuilder
 import java.text.ParseException
 import java.time.LocalDate
 import java.time.ZoneId
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimes.kt
similarity index 93%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimes.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimes.kt
index 5ff6988bf8..c242a5a55f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimes.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture
 
 import android.content.Context
 import java.time.LocalDate
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemAnswerOptionComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemAnswerOptionComponents.kt
similarity index 100%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemAnswerOptionComponents.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemAnswerOptionComponents.kt
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
similarity index 97%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 199129a514..2776176955 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -23,7 +23,7 @@ import android.text.Spanned
 import androidx.core.text.HtmlCompat
 import ca.uhn.fhir.util.UrlUtil
 import com.google.android.fhir.datacapture.common.datatype.asStringValue
-import com.google.android.fhir.datacapture.utilities.evaluateToDisplay
+import com.google.android.fhir.datacapture.fhirpath.evaluateToDisplay
 import com.google.android.fhir.getLocalizedText
 import java.math.BigDecimal
 import kotlinx.coroutines.Dispatchers
@@ -47,15 +47,15 @@ import timber.log.Timber
 /** UI controls relevant to capturing question data. */
 internal enum class ItemControlTypes(
   val extensionCode: String,
-  val viewHolderType: QuestionnaireItemViewHolderType,
+  val viewHolderType: QuestionnaireViewHolderType,
 ) {
-  AUTO_COMPLETE("autocomplete", QuestionnaireItemViewHolderType.AUTO_COMPLETE),
-  CHECK_BOX("check-box", QuestionnaireItemViewHolderType.CHECK_BOX_GROUP),
-  DROP_DOWN("drop-down", QuestionnaireItemViewHolderType.DROP_DOWN),
-  OPEN_CHOICE("open-choice", QuestionnaireItemViewHolderType.DIALOG_SELECT),
-  RADIO_BUTTON("radio-button", QuestionnaireItemViewHolderType.RADIO_GROUP),
-  SLIDER("slider", QuestionnaireItemViewHolderType.SLIDER),
-  PHONE_NUMBER("phone-number", QuestionnaireItemViewHolderType.PHONE_NUMBER),
+  AUTO_COMPLETE("autocomplete", QuestionnaireViewHolderType.AUTO_COMPLETE),
+  CHECK_BOX("check-box", QuestionnaireViewHolderType.CHECK_BOX_GROUP),
+  DROP_DOWN("drop-down", QuestionnaireViewHolderType.DROP_DOWN),
+  OPEN_CHOICE("open-choice", QuestionnaireViewHolderType.DIALOG_SELECT),
+  RADIO_BUTTON("radio-button", QuestionnaireViewHolderType.RADIO_GROUP),
+  SLIDER("slider", QuestionnaireViewHolderType.SLIDER),
+  PHONE_NUMBER("phone-number", QuestionnaireViewHolderType.PHONE_NUMBER),
 }
 
 // Please note these URLs do not point to any FHIR Resource and are broken links. They are being
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemAnswerComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemAnswerComponents.kt
similarity index 100%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemAnswerComponents.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemAnswerComponents.kt
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaires.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt
similarity index 92%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaires.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt
index 6572c39aec..002acfc6d9 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaires.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
+import com.google.android.fhir.datacapture.DisplayItemControlType
+import com.google.android.fhir.datacapture.EXTENSION_VARIABLE_URL
+import com.google.android.fhir.datacapture.displayItemControl
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Questionnaire
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesResponseItemComponents.kt
similarity index 100%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponseItemComponents.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesResponseItemComponents.kt
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponses.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesResponses.kt
similarity index 100%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnairesResponses.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesResponses.kt
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/common/datatype/MoreTypes.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
similarity index 81%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/common/datatype/MoreTypes.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
index e05e9805ad..2486013047 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/common/datatype/MoreTypes.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreTypes.kt
@@ -18,17 +18,19 @@ package com.google.android.fhir.datacapture.common.datatype
 
 import android.content.Context
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.utilities.format
-import com.google.android.fhir.datacapture.utilities.toLocalizedString
-import com.google.android.fhir.datacapture.views.localDate
-import com.google.android.fhir.datacapture.views.localTime
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.toLocalizedString
+import com.google.android.fhir.datacapture.views.factories.localDate
+import com.google.android.fhir.datacapture.views.factories.localTime
 import com.google.android.fhir.getLocalizedText
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.BooleanType
+import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.DateType
 import org.hl7.fhir.r4.model.DecimalType
+import org.hl7.fhir.r4.model.IdType
 import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.PrimitiveType
 import org.hl7.fhir.r4.model.Quantity
@@ -91,3 +93,23 @@ fun Type.displayString(context: Context): String =
         ?: context.getString(R.string.not_answered)
     else -> context.getString(R.string.not_answered)
   }
+
+/** Converts StringType to toUriType. */
+internal fun StringType.toUriType(): UriType {
+  return UriType(value)
+}
+
+/** Converts StringType to CodeType. */
+internal fun StringType.toCodeType(): CodeType {
+  return CodeType(value)
+}
+
+/** Converts StringType to IdType. */
+internal fun StringType.toIdType(): IdType {
+  return IdType(value)
+}
+
+/** Converts Coding to CodeType. */
+internal fun Coding.toCodeType(): CodeType {
+  return CodeType(code)
+}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
index f530878044..b0abff6580 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluator.kt
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.fhirpath
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.datacapture.calculatedExpression
+import com.google.android.fhir.datacapture.extensions.findVariableExpression
 import com.google.android.fhir.datacapture.findVariableExpression
 import com.google.android.fhir.datacapture.flattened
 import com.google.android.fhir.datacapture.isReferencedBy
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/FhirPathUtil.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
similarity index 95%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/FhirPathUtil.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
index 917d24c5a5..a7db90684c 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/FhirPathUtil.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.fhirpath
 
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
index 449e33cec1..2b4900cf35 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
@@ -19,13 +19,12 @@ package com.google.android.fhir.datacapture.mapping
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.datacapture.DataCapture
+import com.google.android.fhir.datacapture.common.datatype.toCodeType
+import com.google.android.fhir.datacapture.common.datatype.toIdType
+import com.google.android.fhir.datacapture.common.datatype.toUriType
 import com.google.android.fhir.datacapture.createQuestionnaireResponseItem
-import com.google.android.fhir.datacapture.targetStructureMap
-import com.google.android.fhir.datacapture.utilities.toCodeType
-import com.google.android.fhir.datacapture.utilities.toCoding
-import com.google.android.fhir.datacapture.utilities.toIdType
-import com.google.android.fhir.datacapture.utilities.toUriType
-import java.lang.IllegalArgumentException
+import com.google.android.fhir.datacapture.extensions.targetStructureMap
+import com.google.android.fhir.datacapture.toCoding
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
@@ -596,14 +595,14 @@ private fun getFieldNameByDefinition(definition: String): String {
  * `addName` function for `name`.
  */
 private fun Base.addRepeatedFieldValue(fieldName: String) =
-  javaClass.getMethod("add${fieldName.capitalize(Locale.ROOT)}").invoke(this) as Base
+  javaClass.getMethod("add${fieldName.capitalize()}").invoke(this) as Base
 
 /**
  * Invokes the function to get a value in the choice of data type field in the `Base` object, e.g.,
  * `getValueQuantity` for `valueQuantity`.
  */
 private fun Base.getChoiceFieldValue(fieldName: String) =
-  javaClass.getMethod("get${fieldName.capitalize(Locale.ROOT)}").invoke(this) as Base
+  javaClass.getMethod("get${fieldName.capitalize()}").invoke(this) as Base
 
 /**
  * Updates a field of name [field.name] on this object with the generated enum from [value] using
@@ -624,7 +623,7 @@ private fun updateFieldWithEnum(base: Base, field: Field, value: Base) {
   val stringValue = if (value is Coding) value.code else value.toString()
 
   base.javaClass
-    .getMethod("set${field.name.capitalize(Locale.ROOT)}", field.nonParameterizedType)
+    .getMethod("set${field.name.capitalize()}", field.nonParameterizedType)
     .invoke(base, fromCodeMethod.invoke(dataTypeClass, stringValue))
 }
 
@@ -666,7 +665,7 @@ private fun updateField(
 
 private fun setFieldElementValue(base: Base, field: Field, answerValue: Base) {
   base.javaClass
-    .getMethod("set${field.name.capitalize(Locale.ROOT)}Element", field.type)
+    .getMethod("set${field.name.capitalize()}Element", field.type)
     .invoke(base, answerValue)
 }
 
@@ -681,10 +680,14 @@ private fun addAnswerToListField(base: Base, field: Field, answerValue: List<Bas
 
 private fun updateListFieldWithAnswer(base: Base, field: Field, answerValue: List<Base>) {
   base.javaClass
-    .getMethod("set${field.name.capitalize(Locale.ROOT)}", field.type)
+    .getMethod("set${field.name.capitalize()}", field.type)
     .invoke(base, if (field.isParameterized && field.isList) answerValue else answerValue.first())
 }
 
+private fun String.capitalize() = replaceFirstChar {
+  if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString()
+}
+
 /**
  * This method enables us to perform an extra step to wrap the answer using the correct type. This
  * is useful in cases where a single question maps to a CompositeType such as [CodeableConcept] or
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtil.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtil.kt
deleted file mode 100644
index 4361fc4f66..0000000000
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtil.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.utilities
-
-/**
- * Invokes function specified by [functionName] on the calling object with the provided arguments
- * [args]
- */
-internal fun Any.invokeFunction(
-  functionName: String,
-  parameterTypes: List<Class<*>> = listOf(),
-  vararg args: Any?
-): Any? =
-  this::class
-    .java
-    .getDeclaredMethod(functionName, *parameterTypes.toTypedArray())
-    .apply { isAccessible = true }
-    .invoke(this, *args)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtil.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtil.kt
deleted file mode 100644
index 072470168f..0000000000
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtil.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.utilities
-
-import org.hl7.fhir.r4.model.CodeType
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.IdType
-import org.hl7.fhir.r4.model.StringType
-import org.hl7.fhir.r4.model.UriType
-
-/** Converts StringType to toUriType. */
-internal fun StringType.toUriType(): UriType {
-  return UriType(value)
-}
-
-/** Converts StringType to CodeType. */
-internal fun StringType.toCodeType(): CodeType {
-  return CodeType(value)
-}
-
-/** Converts StringType to IdType. */
-internal fun StringType.toIdType(): IdType {
-  return IdType(value)
-}
-
-/** Converts Coding to CodeType. */
-internal fun Coding.toCodeType(): CodeType {
-  return CodeType(code)
-}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
similarity index 90%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderView.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
index 039ae2e79b..f507c0340a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/GroupHeaderView.kt
@@ -27,11 +27,11 @@ import com.google.android.fhir.datacapture.localizedPrefixSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
 import org.hl7.fhir.r4.model.Questionnaire
 
-internal class QuestionnaireGroupTypeHeaderView(context: Context, attrs: AttributeSet?) :
+internal class GroupHeaderView(context: Context, attrs: AttributeSet?) :
   LinearLayout(context, attrs) {
 
   init {
-    LayoutInflater.from(context).inflate(R.layout.questionnaire_group_type_header, this, true)
+    LayoutInflater.from(context).inflate(R.layout.group_type_header_view, this, true)
   }
 
   fun bind(questionnaireItem: Questionnaire.QuestionnaireItemComponent) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
similarity index 95%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderView.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
index 24a28a108a..bc7cc984d2 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/HeaderView.kt
@@ -36,11 +36,10 @@ import com.google.android.material.card.MaterialCardView
 import org.hl7.fhir.r4.model.Questionnaire
 
 /** View for the prefix, question, and hint of a questionnaire item. */
-internal class QuestionnaireItemHeaderView(context: Context, attrs: AttributeSet?) :
-  LinearLayout(context, attrs) {
+internal class HeaderView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
   init {
-    LayoutInflater.from(context).inflate(R.layout.questionnaire_item_header, this, true)
+    LayoutInflater.from(context).inflate(R.layout.header_view, this, true)
   }
 
   private var prefix: TextView = findViewById(R.id.prefix)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaView.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
similarity index 93%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaView.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
index 7773eb58ac..2f5911dabe 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemMediaView.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/MediaView.kt
@@ -30,17 +30,16 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.decodeToBitmap
 import com.google.android.fhir.datacapture.fetchBitmapFromUrl
 import com.google.android.fhir.datacapture.itemMedia
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Questionnaire
 import timber.log.Timber
 
-class QuestionnaireItemMediaView(context: Context, attrs: AttributeSet?) :
-  LinearLayout(context, attrs) {
+class MediaView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
   init {
-    LayoutInflater.from(context).inflate(R.layout.questionnaire_item_media, this, true)
+    LayoutInflater.from(context).inflate(R.layout.media_view, this, true)
   }
 
   private var imageAttachment: ImageView = findViewById(R.id.image_attachment)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index 9857fc5993..bf38c1364f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -40,6 +40,9 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.itemAnswerOptionImage
+import com.google.android.fhir.datacapture.views.factories.OptionSelectOption
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemDialogSelectViewModel
+import com.google.android.fhir.datacapture.views.factories.SelectedOptions
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.util.concurrent.atomic.AtomicInteger
@@ -76,9 +79,7 @@ internal class OptionSelectDialogFragment(
       }
 
     val dialogThemeContext = ContextThemeWrapper(requireContext(), themeId)
-    val view =
-      LayoutInflater.from(dialogThemeContext)
-        .inflate(R.layout.questionnaire_item_multi_select_dialog, null)
+    val view = LayoutInflater.from(dialogThemeContext).inflate(R.layout.multi_select_dialog, null)
 
     val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view)
     recyclerView.layoutManager = LinearLayoutManager(requireContext())
@@ -376,13 +377,13 @@ private sealed class OptionSelectViewHolder(parent: ViewGroup, layout: Int) :
   RecyclerView.ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
   /** Radio button option. */
   class OptionSingle(parent: ViewGroup) :
-    OptionSelectViewHolder(parent, R.layout.questionnaire_item_option_item_single) {
+    OptionSelectViewHolder(parent, R.layout.option_item_single) {
     val radioButton: RadioButton = itemView.findViewById(R.id.radio_button)
   }
 
   /** Checkbox option. */
   class OptionMulti(parent: ViewGroup) :
-    OptionSelectViewHolder(parent, R.layout.questionnaire_item_option_item_multi) {
+    OptionSelectViewHolder(parent, R.layout.option_item_multi) {
     val checkbox: CheckBox = itemView.findViewById(R.id.checkbox)
   }
 
@@ -390,7 +391,7 @@ private sealed class OptionSelectViewHolder(parent: ViewGroup, layout: Int) :
    * Freeform option, only shown if [OptionSelectDialogFragment.Config.otherOptionsAllowed] is true.
    */
   class OtherEditText(parent: ViewGroup) :
-    OptionSelectViewHolder(parent, R.layout.questionnaire_item_option_item_other_text) {
+    OptionSelectViewHolder(parent, R.layout.option_item_other_text) {
     val editText: EditText = itemView.findViewById(R.id.edit_text)
     val delete: View = itemView.findViewById(R.id.delete_button)
 
@@ -408,7 +409,7 @@ private sealed class OptionSelectViewHolder(parent: ViewGroup, layout: Int) :
    * Freeform option, only shown if [OptionSelectDialogFragment.Config.otherOptionsAllowed] is true.
    */
   class OtherAddAnother(parent: ViewGroup) :
-    OptionSelectViewHolder(parent, R.layout.questionnaire_item_option_item_other_add_another) {
+    OptionSelectViewHolder(parent, R.layout.option_item_other_add_another) {
     val addAnother: Button = itemView.findViewById(R.id.add_another)
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
similarity index 89%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
index 986a46f144..fd2141fa2a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItem.kt
@@ -56,7 +56,7 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
  * extension exists options
  * @param draftAnswer the draft input that cannot be stored in the [QuestionnaireResponse].
  */
-data class QuestionnaireItemViewItem(
+data class QuestionnaireViewItem(
   val questionnaireItem: Questionnaire.QuestionnaireItemComponent,
   private val questionnaireResponseItem: QuestionnaireResponse.QuestionnaireResponseItemComponent,
   val validationResult: ValidationResult,
@@ -197,26 +197,26 @@ data class QuestionnaireItemViewItem(
       }
 
   /**
-   * Returns whether this [QuestionnaireItemViewItem] and the `other` [QuestionnaireItemViewItem]
-   * have the same [Questionnaire.QuestionnaireItemComponent] and
+   * Returns whether this [QuestionnaireViewItem] and the `other` [QuestionnaireViewItem] have the
+   * same [Questionnaire.QuestionnaireItemComponent] and
    * [QuestionnaireResponse.QuestionnaireResponseItemComponent].
    *
-   * This is useful for determining if two [QuestionnaireItemViewItem]s are representing the same
+   * This is useful for determining if two [QuestionnaireViewItem]s are representing the same
    * question and answer in the [Questionnaire] and [QuestionnaireResponse]. This can be used to
    * update the [RecyclerView] UI.
    */
-  internal fun hasTheSameItem(other: QuestionnaireItemViewItem) =
+  internal fun hasTheSameItem(other: QuestionnaireViewItem) =
     questionnaireItem === other.questionnaireItem &&
       questionnaireResponseItem === other.questionnaireResponseItem
 
   /**
-   * Returns whether this [QuestionnaireItemViewItem] and the `other` [QuestionnaireItemViewItem]
-   * have the same answers.
+   * Returns whether this [QuestionnaireViewItem] and the `other` [QuestionnaireViewItem] have the
+   * same answers.
    *
-   * This is useful for determining if the [QuestionnaireItemViewItem] has outdated answer(s) and
+   * This is useful for determining if the [QuestionnaireViewItem] has outdated answer(s) and
    * therefore needs to be updated in the [RecyclerView] UI.
    */
-  internal fun hasTheSameAnswer(other: QuestionnaireItemViewItem) =
+  internal fun hasTheSameAnswer(other: QuestionnaireViewItem) =
     answers.size == other.answers.size &&
       answers
         .zip(other.answers) { answer, otherAnswer ->
@@ -228,13 +228,13 @@ data class QuestionnaireItemViewItem(
       draftAnswer == other.draftAnswer
 
   /**
-   * Returns whether this [QuestionnaireItemViewItem] and the `other` [QuestionnaireItemViewItem]
-   * have the same [ValidationResult].
+   * Returns whether this [QuestionnaireViewItem] and the `other` [QuestionnaireViewItem] have the
+   * same [ValidationResult].
    *
-   * This is useful for determining if the [QuestionnaireItemViewItem] has outdated
-   * [ValidationResult] and therefore needs to be updated in the [RecyclerView] UI.
+   * This is useful for determining if the [QuestionnaireViewItem] has outdated [ValidationResult]
+   * and therefore needs to be updated in the [RecyclerView] UI.
    */
-  internal fun hasTheSameValidationResult(other: QuestionnaireItemViewItem): Boolean {
+  internal fun hasTheSameValidationResult(other: QuestionnaireViewItem): Boolean {
     if (validationResult is NotValidated || validationResult is Valid) {
       return other.validationResult is NotValidated || other.validationResult is Valid
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
index 301d11557f..c9c63b5e0f 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
@@ -26,7 +26,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
-import com.google.android.fhir.datacapture.views.QuestionnaireItemAttachmentViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
 import timber.log.Timber
 
 /** Used for launching camera activity */
@@ -36,8 +36,7 @@ class CameraLauncherFragment : DialogFragment() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    val uri =
-      arguments?.get(QuestionnaireItemAttachmentViewHolderFactory.EXTRA_SAVED_PHOTO_URI_KEY) as Uri
+    val uri = arguments?.get(AttachmentViewHolderFactory.EXTRA_SAVED_PHOTO_URI_KEY) as Uri
 
     cameraLauncher =
       registerForActivityResult(ActivityResultContracts.TakePicture()) { isSaved ->
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
index b6c6a28a42..b3c4f663b5 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
@@ -21,15 +21,14 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
-import com.google.android.fhir.datacapture.views.QuestionnaireItemAttachmentViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
 
 /** Used for launching open document activity */
 class OpenDocumentLauncherFragment : DialogFragment() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    val mimeTypes =
-      arguments?.getStringArray(QuestionnaireItemAttachmentViewHolderFactory.EXTRA_MIME_TYPE_KEY)
+    val mimeTypes = arguments?.getStringArray(AttachmentViewHolderFactory.EXTRA_MIME_TYPE_KEY)
 
     registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
         setFragmentResult(OPEN_DOCUMENT_RESULT_KEY, bundleOf(OPEN_DOCUMENT_RESULT_KEY to uri))
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
similarity index 92%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
index 4aaa780be9..5ff36c6348 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAttachmentViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.content.Context
 import android.net.Uri
@@ -37,11 +37,13 @@ import com.google.android.fhir.datacapture.hasMimeTypeOnly
 import com.google.android.fhir.datacapture.isGivenSizeOverLimit
 import com.google.android.fhir.datacapture.maxSizeInMiBs
 import com.google.android.fhir.datacapture.mimeTypes
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.datacapture.views.attachment.CameraLauncherFragment
 import com.google.android.fhir.datacapture.views.attachment.OpenDocumentLauncherFragment
 import com.google.android.material.divider.MaterialDivider
@@ -52,12 +54,12 @@ import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemAttachmentViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_attachment_view) {
+internal object AttachmentViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.attachment_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
-      private lateinit var header: QuestionnaireItemHeaderView
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
+      private lateinit var header: HeaderView
       private lateinit var errorTextView: TextView
       private lateinit var takePhotoButton: Button
       private lateinit var uploadPhotoButton: Button
@@ -99,9 +101,9 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
         context = itemView.context.tryUnwrapContext()!!
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        this.questionnaireItemViewItem = questionnaireItemViewItem
-        val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        this.questionnaireViewItem = questionnaireViewItem
+        val questionnaireItem = questionnaireViewItem.questionnaireItem
         header.bind(questionnaireItem)
         displayOrClearInitialPreview()
         displayTakePhotoButton(questionnaireItem)
@@ -114,7 +116,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
         uploadFileButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
         photoDeleteButton.setOnClickListener { view -> onDeleteClicked(view) }
         fileDeleteButton.setOnClickListener { view -> onDeleteClicked(view) }
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
@@ -140,7 +142,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
       }
 
       private fun displayOrClearInitialPreview() {
-        val answer = questionnaireItemViewItem.answers.firstOrNull()
+        val answer = questionnaireViewItem.answers.firstOrNull()
 
         // Clear preview if there is no answer to prevent showing old previews in views that have
         // been recycled.
@@ -227,7 +229,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
                   creation = Date()
                 }
             }
-          questionnaireItemViewItem.setAnswer(answer)
+          questionnaireViewItem.setAnswer(answer)
 
           divider.visibility = View.VISIBLE
           labelUploaded.visibility = View.VISIBLE
@@ -242,10 +244,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
 
         CameraLauncherFragment()
           .apply { arguments = bundleOf(EXTRA_SAVED_PHOTO_URI_KEY to attachmentUri) }
-          .show(
-            context.supportFragmentManager,
-            QuestionnaireItemAttachmentViewHolderFactory.javaClass.simpleName
-          )
+          .show(context.supportFragmentManager, AttachmentViewHolderFactory.javaClass.simpleName)
       }
 
       private fun onUploadClicked(view: View, questionnaireItem: QuestionnaireItemComponent) {
@@ -287,7 +286,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
                   creation = Date()
                 }
             }
-          questionnaireItemViewItem.setAnswer(answer)
+          questionnaireViewItem.setAnswer(answer)
 
           divider.visibility = View.VISIBLE
           labelUploaded.visibility = View.VISIBLE
@@ -303,10 +302,7 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
           .apply {
             arguments = bundleOf(EXTRA_MIME_TYPE_KEY to questionnaireItem.mimeTypes.toTypedArray())
           }
-          .show(
-            context.supportFragmentManager,
-            QuestionnaireItemAttachmentViewHolderFactory.javaClass.simpleName
-          )
+          .show(context.supportFragmentManager, AttachmentViewHolderFactory.javaClass.simpleName)
       }
 
       private fun displayPreview(
@@ -370,14 +366,14 @@ internal object QuestionnaireItemAttachmentViewHolderFactory :
       }
 
       private fun onDeleteClicked(view: View) {
-        questionnaireItemViewItem.clearAnswer()
+        questionnaireViewItem.clearAnswer()
         divider.visibility = View.GONE
         labelUploaded.visibility = View.GONE
         clearPhotoPreview()
         clearFilePreview()
         displaySnackbarOnDelete(
           view,
-          getMimeType(questionnaireItemViewItem.answers.first().valueAttachment.contentType)
+          getMimeType(questionnaireViewItem.answers.first().valueAttachment.contentType)
         )
       }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
similarity index 83%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
index a67562a643..454c784189 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.AdapterView
@@ -29,24 +29,26 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.textfield.TextInputLayout
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemAutoCompleteViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_edit_text_auto_complete_view) {
+internal object AutoCompleteViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.edit_text_auto_complete_view) {
 
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var autoCompleteTextView: MaterialAutoCompleteTextView
       private lateinit var chipContainer: ChipGroup
       private lateinit var textInputLayout: TextInputLayout
       private val canHaveMultipleAnswers
-        get() = questionnaireItemViewItem.questionnaireItem.repeats
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+        get() = questionnaireViewItem.questionnaireItem.repeats
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private lateinit var errorTextView: TextView
 
       override fun init(itemView: View) {
@@ -60,7 +62,7 @@ internal object QuestionnaireItemAutoCompleteViewHolderFactory :
             val answer =
               QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                 value =
-                  questionnaireItemViewItem.answerOption
+                  questionnaireViewItem.answerOption
                     .first {
                       it.value.displayString(header.context) ==
                         autoCompleteTextView.adapter.getItem(position) as String
@@ -73,23 +75,18 @@ internal object QuestionnaireItemAutoCompleteViewHolderFactory :
           }
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        header.bind(questionnaireViewItem.questionnaireItem)
 
         val answerOptionString =
-          questionnaireItemViewItem.answerOption.map { it.value.displayString(header.context) }
-        val adapter =
-          ArrayAdapter(
-            header.context,
-            R.layout.questionnaire_item_drop_down_list_item,
-            answerOptionString
-          )
+          questionnaireViewItem.answerOption.map { it.value.displayString(header.context) }
+        val adapter = ArrayAdapter(header.context, R.layout.drop_down_list_item, answerOptionString)
         autoCompleteTextView.setAdapter(adapter)
         // Remove chips if any from the last bindView call on this VH.
         chipContainer.removeAllViews()
         presetValuesIfAny()
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
@@ -104,7 +101,7 @@ internal object QuestionnaireItemAutoCompleteViewHolderFactory :
       }
 
       private fun presetValuesIfAny() {
-        questionnaireItemViewItem.answers.map { answer -> addNewChipIfNotPresent(answer) }
+        questionnaireViewItem.answers.map { answer -> addNewChipIfNotPresent(answer) }
       }
 
       private fun onAnswerSelected(
@@ -163,28 +160,28 @@ internal object QuestionnaireItemAutoCompleteViewHolderFactory :
             tag = answer
           }
         }
-        questionnaireItemViewItem.setAnswer(answer)
+        questionnaireViewItem.setAnswer(answer)
       }
 
       private fun handleSelectionWhenQuestionCanHaveMultipleAnswers(
         answer: QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
       ) {
         val answerNotPresent =
-          questionnaireItemViewItem.answers.none { it.value.equalsDeep(answer.value) }
+          questionnaireViewItem.answers.none { it.value.equalsDeep(answer.value) }
 
         if (answerNotPresent) {
           addNewChipIfNotPresent(answer)
-          questionnaireItemViewItem.addAnswer(answer)
+          questionnaireViewItem.addAnswer(answer)
         }
       }
 
       private fun onChipRemoved(chip: Chip) {
         if (canHaveMultipleAnswers) {
           (chip.tag as QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent).let {
-            questionnaireItemViewItem.removeAnswer(it)
+            questionnaireViewItem.removeAnswer(it)
           }
         } else {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
         }
       }
 
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
similarity index 80%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
index 59dfb3511d..a16dccd217 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.view.ViewGroup
@@ -28,20 +28,22 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_boolean_type_picker_view) {
+internal object BooleanChoiceViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.boolean_choice_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var radioGroup: ConstraintLayout
       private lateinit var yesRadioButton: RadioButton
       private lateinit var noRadioButton: RadioButton
       private lateinit var flow: Flow
 
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -51,9 +53,9 @@ internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
         flow = itemView.findViewById(R.id.flow)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        this.questionnaireItemViewItem = questionnaireItemViewItem
-        val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        this.questionnaireViewItem = questionnaireViewItem
+        val questionnaireItem = questionnaireViewItem.questionnaireItem
         header.bind(questionnaireItem)
         val choiceOrientation =
           questionnaireItem.choiceOrientation ?: ChoiceOrientationTypes.VERTICAL
@@ -73,7 +75,7 @@ internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
         yesRadioButton.setLayoutParamsByOrientation(choiceOrientation)
         noRadioButton.setLayoutParamsByOrientation(choiceOrientation)
 
-        when (questionnaireItemViewItem.answers.singleOrNull()?.valueBooleanType?.value) {
+        when (questionnaireViewItem.answers.singleOrNull()?.valueBooleanType?.value) {
           true -> {
             yesRadioButton.isChecked = true
             noRadioButton.isChecked = false
@@ -89,13 +91,12 @@ internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
         }
 
         yesRadioButton.setOnClickListener {
-          if (questionnaireItemViewItem.answers.singleOrNull()?.valueBooleanType?.booleanValue() ==
-              true
+          if (questionnaireViewItem.answers.singleOrNull()?.valueBooleanType?.booleanValue() == true
           ) {
-            questionnaireItemViewItem.clearAnswer()
+            questionnaireViewItem.clearAnswer()
             yesRadioButton.isChecked = false
           } else {
-            questionnaireItemViewItem.setAnswer(
+            questionnaireViewItem.setAnswer(
               QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                 value = BooleanType(true)
               }
@@ -104,13 +105,13 @@ internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
         }
 
         noRadioButton.setOnClickListener {
-          if (questionnaireItemViewItem.answers.singleOrNull()?.valueBooleanType?.booleanValue() ==
+          if (questionnaireViewItem.answers.singleOrNull()?.valueBooleanType?.booleanValue() ==
               false
           ) {
-            questionnaireItemViewItem.clearAnswer()
+            questionnaireViewItem.clearAnswer()
             noRadioButton.isChecked = false
           } else {
-            questionnaireItemViewItem.setAnswer(
+            questionnaireViewItem.setAnswer(
               QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                 value = BooleanType(false)
               }
@@ -118,7 +119,7 @@ internal object QuestionnaireItemBooleanTypePickerViewHolderFactory :
           }
         }
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
similarity index 80%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
index 9110fa1096..75c98136e6 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.LayoutInflater
 import android.view.View
@@ -32,17 +32,19 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_checkbox_group_view) {
+internal object CheckBoxGroupViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.checkbox_group_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var checkboxGroup: ConstraintLayout
       private lateinit var flow: Flow
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -50,8 +52,8 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
         flow = itemView.findViewById(R.id.checkbox_flow)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        val questionnaireItem = questionnaireViewItem.questionnaireItem
         val choiceOrientation =
           questionnaireItem.choiceOrientation ?: ChoiceOrientationTypes.VERTICAL
 
@@ -69,13 +71,13 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
             flow.setWrapMode(Flow.WRAP_NONE)
           }
         }
-        questionnaireItemViewItem.answerOption
+        questionnaireViewItem.answerOption
           .map { answerOption -> View.generateViewId() to answerOption }
           .onEach { populateViewWithAnswerOption(it.first, it.second, choiceOrientation) }
           .map { it.first }
           .let { flow.referencedIds = it.toIntArray() }
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
@@ -92,8 +94,7 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
         choiceOrientation: ChoiceOrientationTypes
       ) {
         val checkboxLayout =
-          LayoutInflater.from(checkboxGroup.context)
-            .inflate(R.layout.questionnaire_item_check_box_view, null)
+          LayoutInflater.from(checkboxGroup.context).inflate(R.layout.check_box_view, null)
         val checkbox =
           checkboxLayout.findViewById<CheckBox>(R.id.check_box).apply {
             id = viewId
@@ -104,7 +105,7 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
               null,
               null
             )
-            isChecked = questionnaireItemViewItem.isAnswerOptionSelected(answerOption)
+            isChecked = questionnaireViewItem.isAnswerOptionSelected(answerOption)
             layoutParams =
               ViewGroup.LayoutParams(
                 when (choiceOrientation) {
@@ -116,7 +117,7 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
             setOnClickListener {
               when (isChecked) {
                 true -> {
-                  val newAnswers = questionnaireItemViewItem.answers.toMutableList()
+                  val newAnswers = questionnaireViewItem.answers.toMutableList()
                   newAnswers +=
                     QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                       value = answerOption.value
@@ -126,31 +127,31 @@ internal object QuestionnaireItemCheckBoxGroupViewHolderFactory :
                     // if this answer option has optionExclusive extension, then deselect other
                     // answer options.
                     val optionExclusiveIndex = checkboxGroup.indexOfChild(it) - 1
-                    for (i in 0 until questionnaireItemViewItem.answerOption.size) {
+                    for (i in 0 until questionnaireViewItem.answerOption.size) {
                       if (optionExclusiveIndex == i) {
                         continue
                       }
                       (checkboxGroup.getChildAt(i + 1) as CheckBox).isChecked = false
                       newAnswers.removeIf {
-                        it.value.equalsDeep(questionnaireItemViewItem.answerOption[i].value)
+                        it.value.equalsDeep(questionnaireViewItem.answerOption[i].value)
                       }
                     }
                   } else {
                     // deselect optionExclusive answer option.
-                    for (i in 0 until questionnaireItemViewItem.answerOption.size) {
-                      if (!questionnaireItemViewItem.answerOption[i].optionExclusive) {
+                    for (i in 0 until questionnaireViewItem.answerOption.size) {
+                      if (!questionnaireViewItem.answerOption[i].optionExclusive) {
                         continue
                       }
                       (checkboxGroup.getChildAt(i + 1) as CheckBox).isChecked = false
                       newAnswers.removeIf {
-                        it.value.equalsDeep(questionnaireItemViewItem.answerOption[i].value)
+                        it.value.equalsDeep(questionnaireViewItem.answerOption[i].value)
                       }
                     }
                   }
-                  questionnaireItemViewItem.setAnswer(*newAnswers.toTypedArray())
+                  questionnaireViewItem.setAnswer(*newAnswers.toTypedArray())
                 }
                 false -> {
-                  questionnaireItemViewItem.removeAnswer(
+                  questionnaireViewItem.removeAnswer(
                     QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                       value = answerOption.value
                     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
similarity index 87%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
index 74912c6ac2..63164a84ec 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -22,17 +22,19 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.utilities.canonicalizeDatePattern
-import com.google.android.fhir.datacapture.utilities.format
-import com.google.android.fhir.datacapture.utilities.getDateSeparator
-import com.google.android.fhir.datacapture.utilities.parseDate
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
+import com.google.android.fhir.datacapture.canonicalizeDatePattern
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.getDateSeparator
+import com.google.android.fhir.datacapture.parseDate
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.MaxValueConstraintValidator.getMaxValue
 import com.google.android.fhir.datacapture.validation.MinValueConstraintValidator.getMinValue
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.datepicker.CalendarConstraints
 import com.google.android.material.datepicker.CalendarConstraints.DateValidator
 import com.google.android.material.datepicker.CompositeDateValidator
@@ -55,14 +57,14 @@ import kotlin.math.log10
 import org.hl7.fhir.r4.model.DateType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemDatePickerViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_date_picker_view) {
+internal object DatePickerViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.date_picker_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var textInputLayout: TextInputLayout
       private lateinit var textInputEditText: TextInputEditText
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private lateinit var canonicalizedDatePattern: String
       private lateinit var textWatcher: DatePatternTextWatcher
 
@@ -85,7 +87,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
                     .toLocalDate()
                     .format(canonicalizedDatePattern)
                 textInputEditText.setText(formattedDate)
-                questionnaireItemViewItem.setAnswer(
+                questionnaireViewItem.setAnswer(
                   QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
                     val localDate =
                       Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()
@@ -101,8 +103,8 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
       }
 
       @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        header.bind(questionnaireViewItem.questionnaireItem)
         val localeDatePattern = getLocalizedDateTimePattern()
         // Special character used in date pattern
         val datePatternSeparator = getDateSeparator(localeDatePattern)
@@ -112,13 +114,13 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
         textInputEditText.removeTextChangedListener(textWatcher)
         updateTextFieldToDisplayDateValue()
         textInputEditText.addTextChangedListener(textWatcher)
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
         // Since the draft answer is still displayed in the text field, do not erase the error
         // text if the answer is cleared and the validation result is valid.
-        if (questionnaireItemViewItem.answers.isEmpty() && validationResult == Valid) {
+        if (questionnaireViewItem.answers.isEmpty() && validationResult == Valid) {
           return
         }
         textInputLayout.error =
@@ -136,7 +138,7 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
 
       private fun createMaterialDatePicker(): MaterialDatePicker<Long> {
         val selectedDate =
-          questionnaireItemViewItem.answers
+          questionnaireViewItem.answers
             .singleOrNull()
             ?.valueDateType
             ?.localDate
@@ -152,10 +154,8 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
       }
 
       private fun getCalenderConstraint(): CalendarConstraints {
-        val min =
-          (getMinValue(questionnaireItemViewItem.questionnaireItem) as? DateType)?.value?.time
-        val max =
-          (getMaxValue(questionnaireItemViewItem.questionnaireItem) as? DateType)?.value?.time
+        val min = (getMinValue(questionnaireViewItem.questionnaireItem) as? DateType)?.value?.time
+        val max = (getMaxValue(questionnaireViewItem.questionnaireItem) as? DateType)?.value?.time
 
         if (min != null && max != null && min > max) {
           throw IllegalArgumentException("minValue cannot be greater than maxValue")
@@ -171,12 +171,12 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
 
       private fun updateAnswer(text: String?) {
         if (text.isNullOrEmpty()) {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
           return
         }
         try {
           val localDate = parseDate(text, canonicalizedDatePattern)
-          questionnaireItemViewItem.setAnswer(
+          questionnaireViewItem.setAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               value = localDate.dateType
             }
@@ -187,17 +187,17 @@ internal object QuestionnaireItemDatePickerViewHolderFactory :
               listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
             )
           )
-          if (questionnaireItemViewItem.answers.isNotEmpty()) {
-            questionnaireItemViewItem.clearAnswer()
+          if (questionnaireViewItem.answers.isNotEmpty()) {
+            questionnaireViewItem.clearAnswer()
           }
-          questionnaireItemViewItem.setDraftAnswer(text.toString())
+          questionnaireViewItem.setDraftAnswer(text.toString())
         }
       }
 
       private fun updateTextFieldToDisplayDateValue() {
-        val draftAnswerToDisplay = questionnaireItemViewItem.draftAnswer as? String
+        val draftAnswerToDisplay = questionnaireViewItem.draftAnswer as? String
         val answer =
-          questionnaireItemViewItem.answers
+          questionnaireViewItem.answers
             .singleOrNull()
             ?.takeIf { it.hasValue() }
             ?.valueDateType
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
similarity index 87%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
index 374f59429e..bdec83493e 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -25,16 +25,18 @@ import android.text.format.DateFormat
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.utilities.canonicalizeDatePattern
-import com.google.android.fhir.datacapture.utilities.format
-import com.google.android.fhir.datacapture.utilities.getDateSeparator
-import com.google.android.fhir.datacapture.utilities.parseDate
-import com.google.android.fhir.datacapture.utilities.toLocalizedString
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
+import com.google.android.fhir.datacapture.canonicalizeDatePattern
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.getDateSeparator
+import com.google.android.fhir.datacapture.parseDate
+import com.google.android.fhir.datacapture.toLocalizedString
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -51,16 +53,16 @@ import java.util.Date
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemDateTimePickerViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_date_time_picker_view) {
+internal object DateTimePickerViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.date_time_picker_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var dateInputLayout: TextInputLayout
       private lateinit var dateInputEditText: TextInputEditText
       private lateinit var timeInputLayout: TextInputLayout
       private lateinit var timeInputEditText: TextInputEditText
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private lateinit var canonicalizedDatePattern: String
       private lateinit var textWatcher: DatePatternTextWatcher
 
@@ -81,7 +83,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
           // from the view's context.
           val context = itemView.context.tryUnwrapContext()!!
           val localDateInput =
-            questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localDate
+            questionnaireViewItem.answers.singleOrNull()?.valueDateTimeType?.localDate
           buildMaterialDatePicker(localDateInput)
             .apply {
               addOnPositiveButtonClickListener { epochMilli ->
@@ -119,25 +121,25 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
       }
 
       @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         clearPreviousState()
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+        header.bind(questionnaireViewItem.questionnaireItem)
         dateInputLayout.hint = canonicalizedDatePattern
         dateInputEditText.removeTextChangedListener(textWatcher)
 
         val questionnaireItemViewItemDateTimeAnswer =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localDateTime
+          questionnaireViewItem.answers.singleOrNull()?.valueDateTimeType?.localDateTime
 
         val dateStringToDisplay =
           questionnaireItemViewItemDateTimeAnswer?.toLocalDate()?.format(canonicalizedDatePattern)
-            ?: questionnaireItemViewItem.draftAnswer as? String
+            ?: questionnaireViewItem.draftAnswer as? String
 
         // Determine whether the text field text should be overridden or not.
         if (dateInputEditText.text.toString() != dateStringToDisplay) {
           dateInputEditText.setText(dateStringToDisplay)
         }
 
-        enableOrDisableTimePicker(questionnaireItemViewItem, dateStringToDisplay)
+        enableOrDisableTimePicker(questionnaireViewItem, dateStringToDisplay)
 
         // If there is no set answer in the QuestionnaireItemViewItem, make the time field empty.
         timeInputEditText.setText(
@@ -182,7 +184,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
 
       private fun buildMaterialTimePicker(context: Context, inputMode: Int) {
         val selectedTime =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueDateTimeType?.localTime
+          questionnaireViewItem.answers.singleOrNull()?.valueDateTimeType?.localTime
             ?: LocalTime.now()
         val timeFormat =
           if (DateFormat.is24HourFormat(context)) {
@@ -216,7 +218,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
 
       /** Set the answer in the [QuestionnaireResponse]. */
       private fun setQuestionnaireItemViewItemAnswer(localDateTime: LocalDateTime) {
-        questionnaireItemViewItem.setAnswer(
+        questionnaireViewItem.setAnswer(
           QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
             .setValue(
               DateTimeType(
@@ -242,7 +244,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
       picker disabled and display an error
        */
       private fun enableOrDisableTimePicker(
-        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        questionnaireViewItem: QuestionnaireViewItem,
         dateToDisplay: String?
       ) =
         try {
@@ -250,7 +252,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
             parseDate(dateToDisplay, canonicalizedDatePattern)
             timeInputLayout.isEnabled = true
           }
-          displayDateValidationError(questionnaireItemViewItem.validationResult)
+          displayDateValidationError(questionnaireViewItem.validationResult)
         } catch (e: ParseException) {
           timeInputLayout.isEnabled = false
           displayDateValidationError(
@@ -288,7 +290,7 @@ internal object QuestionnaireItemDateTimePickerViewHolderFactory :
             isDeleting
           )
           // Always set the draft answer because time is not input yet
-          questionnaireItemViewItem.setDraftAnswer(editable.toString())
+          questionnaireViewItem.setDraftAnswer(editable.toString())
         }
       }
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogSelectViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
similarity index 87%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogSelectViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
index 08c9ebde4f..9e86576cb5 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDialogSelectViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DialogSelectViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -31,11 +31,14 @@ import com.google.android.fhir.datacapture.common.datatype.displayString
 import com.google.android.fhir.datacapture.itemControl
 import com.google.android.fhir.datacapture.localizedFlyoverSpanned
 import com.google.android.fhir.datacapture.localizedTextSpanned
-import com.google.android.fhir.datacapture.utilities.tryUnwrapContext
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.OptionSelectDialogFragment
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputLayout
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
@@ -46,29 +49,28 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.StringType
 
 internal object QuestionnaireItemDialogSelectViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_option_select_view) {
+  QuestionnaireItemViewHolderFactory(R.layout.option_select_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     @SuppressLint("StaticFieldLeak")
     object : QuestionnaireItemViewHolderDelegate {
       private lateinit var holder: DialogSelectViewHolder
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private var selectedOptionsJob: Job? = null
 
       override fun init(itemView: View) {
         holder = DialogSelectViewHolder(itemView)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
-        holder.summaryHolder.hint =
-          questionnaireItemViewItem.questionnaireItem.localizedFlyoverSpanned
+        holder.summaryHolder.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
         val activity =
           requireNotNull(holder.header.context.tryUnwrapContext()) {
             "Can only use dialog select in an AppCompatActivity context"
           }
         val viewModel: QuestionnaireItemDialogSelectViewModel by activity.viewModels()
 
-        val item = questionnaireItemViewItem.questionnaireItem
+        val item = questionnaireViewItem.questionnaireItem
 
         // Bind static data
         holder.header.bind(item)
@@ -78,7 +80,7 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
             // Set the initial selected options state from the FHIR data model
             viewModel.updateSelectedOptions(
               item.linkId,
-              questionnaireItemViewItem.extractInitialOptions(holder.header.context)
+              questionnaireViewItem.extractInitialOptions(holder.header.context)
             )
 
             // Listen for changes to selected options to update summary + FHIR data model
@@ -109,7 +111,7 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
         holder.summary.setOnClickListener(onClick)
         holder.summaryHolder.setEndIconOnClickListener(onClick)
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
@@ -130,7 +132,7 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
       }
 
       private fun updateAnswers(selectedOptions: SelectedOptions) {
-        questionnaireItemViewItem.clearAnswer()
+        questionnaireViewItem.clearAnswer()
         var answers = arrayOf<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>()
         selectedOptions.options
           .filter { it.selected }
@@ -146,12 +148,12 @@ internal object QuestionnaireItemDialogSelectViewHolderFactory :
               value = StringType(otherOption)
             }
         }
-        questionnaireItemViewItem.setAnswer(*answers)
+        questionnaireViewItem.setAnswer(*answers)
       }
     }
 
   private class DialogSelectViewHolder(itemView: View) {
-    val header: QuestionnaireItemHeaderView = itemView.findViewById(R.id.header)
+    val header: HeaderView = itemView.findViewById(R.id.header)
     val summary: TextView = itemView.findViewById(R.id.multi_select_summary)
     val summaryHolder: TextInputLayout = itemView.findViewById(R.id.multi_select_summary_holder)
   }
@@ -188,7 +190,7 @@ data class OptionSelectOption(
   val displayString: String = item.value.displayString(context)
 }
 
-private fun QuestionnaireItemViewItem.extractInitialOptions(context: Context): SelectedOptions {
+private fun QuestionnaireViewItem.extractInitialOptions(context: Context): SelectedOptions {
   val options =
     answerOption.map { answerOption ->
       OptionSelectOption(
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
similarity index 64%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
index 99d2faeda6..9b382cd0e7 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactory.kt
@@ -14,24 +14,26 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 
-internal object QuestionnaireItemDisplayViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_display_view) {
+internal object DisplayViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.display_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      private lateinit var header: HeaderView
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        header.bind(questionnaireViewItem.questionnaireItem)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
similarity index 83%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
index 5531e56242..6ed903669a 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -32,19 +32,21 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.textfield.TextInputLayout
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import timber.log.Timber
 
-internal object QuestionnaireItemDropDownViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_drop_down_view) {
+internal object DropDownViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.drop_down_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var textInputLayout: TextInputLayout
       private lateinit var autoCompleteTextView: MaterialAutoCompleteTextView
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
       private lateinit var context: Context
 
       override fun init(itemView: View) {
@@ -54,12 +56,12 @@ internal object QuestionnaireItemDropDownViewHolderFactory :
         context = itemView.context
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
         cleanupOldState()
-        header.bind(questionnaireItemViewItem.questionnaireItem)
-        textInputLayout.hint = questionnaireItemViewItem.questionnaireItem.localizedFlyoverSpanned
+        header.bind(questionnaireViewItem.questionnaireItem)
+        textInputLayout.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
         val answerOptionList =
-          this.questionnaireItemViewItem.answerOption
+          this.questionnaireViewItem.answerOption
             .map {
               DropDownAnswerOption(
                 it.value.displayString(context),
@@ -69,13 +71,9 @@ internal object QuestionnaireItemDropDownViewHolderFactory :
             .toMutableList()
         answerOptionList.add(0, DropDownAnswerOption(context.getString(R.string.hyphen), null))
         val adapter =
-          AnswerOptionDropDownArrayAdapter(
-            context,
-            R.layout.questionnaire_item_drop_down_list_item,
-            answerOptionList
-          )
+          AnswerOptionDropDownArrayAdapter(context, R.layout.drop_down_list_item, answerOptionList)
         val selectedAnswer =
-          questionnaireItemViewItem.answers.singleOrNull()?.value?.displayString(header.context)
+          questionnaireViewItem.answers.singleOrNull()?.value?.displayString(header.context)
         answerOptionList
           .filter { it.answerOptionString == selectedAnswer }
           .singleOrNull()
@@ -101,21 +99,21 @@ internal object QuestionnaireItemDropDownViewHolderFactory :
               null
             )
             val selectedAnswer =
-              questionnaireItemViewItem.answerOption
+              questionnaireViewItem.answerOption
                 .firstOrNull { it.value.displayString(context) == selectedItem?.answerOptionString }
                 ?.value
 
             if (selectedAnswer == null) {
-              questionnaireItemViewItem.clearAnswer()
+              questionnaireViewItem.clearAnswer()
             } else {
-              questionnaireItemViewItem.setAnswer(
+              questionnaireViewItem.setAnswer(
                 QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
                   .setValue(selectedAnswer)
               )
             }
           }
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
similarity index 78%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
index 61d2d888a6..08d6437151 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactory.kt
@@ -14,31 +14,27 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.text.Editable
 import android.text.InputType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import org.hl7.fhir.r4.model.DecimalType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemEditTextDecimalViewHolderFactory :
-  QuestionnaireItemEditTextViewHolderFactory(
-    R.layout.questionnaire_item_edit_text_single_line_view
-  ) {
+internal object EditTextDecimalViewHolderFactory :
+  EditTextViewHolderFactory(R.layout.edit_text_single_line_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemEditTextViewHolderDelegate(DECIMAL_INPUT_TYPE) {
-      override fun handleInput(
-        editable: Editable,
-        questionnaireItemViewItem: QuestionnaireItemViewItem
-      ) {
+      override fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem) {
         val input = getValue(editable.toString())
         if (input != null) {
-          questionnaireItemViewItem.setAnswer(input)
+          questionnaireViewItem.setAnswer(input)
         } else {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
         }
       }
 
@@ -52,13 +48,12 @@ internal object QuestionnaireItemEditTextDecimalViewHolderFactory :
       }
 
       override fun updateUI(
-        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
         textInputLayout: TextInputLayout,
       ) {
         val text =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueDecimalType?.value?.toString()
-            ?: ""
+          questionnaireViewItem.answers.singleOrNull()?.valueDecimalType?.value?.toString() ?: ""
         if (isTextUpdatesRequired(text, textInputEditText.text.toString())) {
           textInputEditText.setText(text)
         }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
similarity index 78%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
index ca3a3c855c..cc53c50d80 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.icu.number.NumberFormatter
 import android.icu.text.DecimalFormat
@@ -23,50 +23,46 @@ import android.text.Editable
 import android.text.InputType
 import androidx.annotation.RequiresApi
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import java.util.Locale
 import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemEditTextIntegerViewHolderFactory :
-  QuestionnaireItemEditTextViewHolderFactory(
-    R.layout.questionnaire_item_edit_text_single_line_view
-  ) {
+internal object EditTextIntegerViewHolderFactory :
+  EditTextViewHolderFactory(R.layout.edit_text_single_line_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object :
       QuestionnaireItemEditTextViewHolderDelegate(
         InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_SIGNED,
       ) {
-      override fun handleInput(
-        editable: Editable,
-        questionnaireItemViewItem: QuestionnaireItemViewItem
-      ) {
+      override fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem) {
         val input = editable.toString()
         if (input.isEmpty()) {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
           return
         }
 
         val inputInteger = input.toIntOrNull()
         if (inputInteger != null) {
-          questionnaireItemViewItem.setAnswer(
+          questionnaireViewItem.setAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
               .setValue(IntegerType(input))
           )
         } else {
-          questionnaireItemViewItem.setDraftAnswer(input)
+          questionnaireViewItem.setDraftAnswer(input)
         }
       }
 
       override fun updateUI(
-        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
         textInputLayout: TextInputLayout,
       ) {
         val answer =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueIntegerType?.value?.toString()
-        val draftAnswer = questionnaireItemViewItem.draftAnswer?.toString()
+          questionnaireViewItem.answers.singleOrNull()?.valueIntegerType?.value?.toString()
+        val draftAnswer = questionnaireViewItem.draftAnswer?.toString()
 
         // Update the text
         val text = answer ?: draftAnswer
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactory.kt
similarity index 65%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactory.kt
index 3c4ceceab4..d5d7dda500 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactory.kt
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import com.google.android.fhir.datacapture.R
 
-internal object QuestionnaireItemEditTextMultiLineViewHolderFactory :
-  QuestionnaireItemEditTextViewHolderFactory(
-    R.layout.questionnaire_item_edit_text_multi_line_view
-  ) {
-  override fun getQuestionnaireItemViewHolderDelegate() =
-    QuestionnaireItemEditTextStringViewHolderDelegate()
+internal object EditTextMultiLineViewHolderFactory :
+  EditTextViewHolderFactory(R.layout.edit_text_multi_line_view) {
+  override fun getQuestionnaireItemViewHolderDelegate() = EditTextStringViewHolderDelegate()
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactory.kt
similarity index 83%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactory.kt
index 2befa8ff5c..9b7853c5aa 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactory.kt
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.text.Editable
 import android.text.InputType
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import java.math.BigDecimal
@@ -29,21 +30,16 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
  * Inherits from QuestionnaireItemEditTextViewHolderFactory as only the numeric part of the quantity
  * is being handled right now. Will use a separate layout to handle the unit in the quantity.
  */
-internal object QuestionnaireItemEditTextQuantityViewHolderFactory :
-  QuestionnaireItemEditTextViewHolderFactory(
-    R.layout.questionnaire_item_edit_text_single_line_view
-  ) {
+internal object EditTextQuantityViewHolderFactory :
+  EditTextViewHolderFactory(R.layout.edit_text_single_line_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemEditTextViewHolderDelegate(QUANTITY_INPUT_TYPE) {
-      override fun handleInput(
-        editable: Editable,
-        questionnaireItemViewItem: QuestionnaireItemViewItem
-      ) {
+      override fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem) {
         val input = getValue(editable.toString())
         if (input != null) {
-          questionnaireItemViewItem.setAnswer(input)
+          questionnaireViewItem.setAnswer(input)
         } else {
-          questionnaireItemViewItem.clearAnswer()
+          questionnaireViewItem.clearAnswer()
         }
       }
 
@@ -59,7 +55,7 @@ internal object QuestionnaireItemEditTextQuantityViewHolderFactory :
           try {
             val value = BigDecimal(text)
             val quantity =
-              with(questionnaireItemViewItem.questionnaireItem) {
+              with(questionnaireViewItem.questionnaireItem) {
                 if (this.hasInitial() && this.initialFirstRep.valueQuantity.hasCode())
                   this.initialFirstRep.valueQuantity.let { initial ->
                     Quantity().apply {
@@ -80,12 +76,12 @@ internal object QuestionnaireItemEditTextQuantityViewHolderFactory :
       }
 
       override fun updateUI(
-        questionnaireItemViewItem: QuestionnaireItemViewItem,
+        questionnaireViewItem: QuestionnaireViewItem,
         textInputEditText: TextInputEditText,
         textInputLayout: TextInputLayout,
       ) {
         val text =
-          questionnaireItemViewItem.answers.singleOrNull()?.valueQuantity?.value?.toString() ?: ""
+          questionnaireViewItem.answers.singleOrNull()?.valueQuantity?.value?.toString() ?: ""
         if (isTextUpdatesRequired(text, textInputEditText.text.toString())) {
           textInputEditText.setText(text)
         }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactory.kt
similarity index 65%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactory.kt
index b674567718..cf88e4b8ff 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactory.kt
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import com.google.android.fhir.datacapture.R
 
-internal object QuestionnaireItemEditTextSingleLineViewHolderFactory :
-  QuestionnaireItemEditTextViewHolderFactory(
-    R.layout.questionnaire_item_edit_text_single_line_view
-  ) {
-  override fun getQuestionnaireItemViewHolderDelegate() =
-    QuestionnaireItemEditTextStringViewHolderDelegate()
+internal object EditTextSingleLineViewHolderFactory :
+  EditTextViewHolderFactory(R.layout.edit_text_single_line_view) {
+  override fun getQuestionnaireItemViewHolderDelegate() = EditTextStringViewHolderDelegate()
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextStringViewHolderDelegate.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
similarity index 74%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextStringViewHolderDelegate.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
index b643bbaaa6..5031a5a6f5 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextStringViewHolderDelegate.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextStringViewHolderDelegate.kt
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.text.Editable
 import android.text.InputType
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -25,24 +26,20 @@ import org.hl7.fhir.r4.model.StringType
 
 /**
  * Implementation of [QuestionnaireItemEditTextViewHolderDelegate] used in
- * [QuestionnaireItemEditTextSingleLineViewHolderFactory] and
- * [QuestionnaireItemEditTextMultiLineViewHolderFactory].
+ * [EditTextSingleLineViewHolderFactory] and [EditTextMultiLineViewHolderFactory].
  *
  * Any `ViewHolder` containing a `EditText` view that collects text data should use this class.
  */
-internal class QuestionnaireItemEditTextStringViewHolderDelegate :
+internal class EditTextStringViewHolderDelegate :
   QuestionnaireItemEditTextViewHolderDelegate(
     InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
   ) {
-  override fun handleInput(
-    editable: Editable,
-    questionnaireItemViewItem: QuestionnaireItemViewItem
-  ) {
+  override fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem) {
     val input = getValue(editable.toString())
     if (input != null) {
-      questionnaireItemViewItem.setAnswer(input)
+      questionnaireViewItem.setAnswer(input)
     } else {
-      questionnaireItemViewItem.clearAnswer()
+      questionnaireViewItem.clearAnswer()
     }
   }
 
@@ -59,11 +56,11 @@ internal class QuestionnaireItemEditTextStringViewHolderDelegate :
   }
 
   override fun updateUI(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
+    questionnaireViewItem: QuestionnaireViewItem,
     textInputEditText: TextInputEditText,
     textInputLayout: TextInputLayout,
   ) {
-    val text = questionnaireItemViewItem.answers.singleOrNull()?.valueStringType?.value ?: ""
+    val text = questionnaireViewItem.answers.singleOrNull()?.valueStringType?.value ?: ""
     if ((text != textInputEditText.text.toString())) {
       textInputEditText.setText(text)
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
similarity index 79%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
index c7d1834ac4..863eb6944d 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/EditTextViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.content.Context
 import android.text.Editable
@@ -31,21 +31,22 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 
-internal abstract class QuestionnaireItemEditTextViewHolderFactory(
-  @LayoutRes override val resId: Int
-) : QuestionnaireItemViewHolderFactory(resId) {
+internal abstract class EditTextViewHolderFactory(@LayoutRes override val resId: Int) :
+  QuestionnaireItemViewHolderFactory(resId) {
   abstract override fun getQuestionnaireItemViewHolderDelegate():
     QuestionnaireItemEditTextViewHolderDelegate
 }
 
 abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputType: Int) :
   QuestionnaireItemViewHolderDelegate {
-  override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+  override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
-  private lateinit var header: QuestionnaireItemHeaderView
+  private lateinit var header: HeaderView
   protected lateinit var textInputLayout: TextInputLayout
   private lateinit var textInputEditText: TextInputEditText
   private var textWatcher: TextWatcher? = null
@@ -73,22 +74,22 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
 
         // Update answer even if the text box loses focus without any change. This will mark the
         // questionnaire response item as being modified in the view model and trigger validation.
-        handleInput(textInputEditText.editableText, questionnaireItemViewItem)
+        handleInput(textInputEditText.editableText, questionnaireViewItem)
       }
     }
   }
 
-  override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-    header.bind(questionnaireItemViewItem.questionnaireItem)
-    textInputLayout.hint = questionnaireItemViewItem.questionnaireItem.localizedFlyoverSpanned
-    displayValidationResult(questionnaireItemViewItem.validationResult)
+  override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+    header.bind(questionnaireViewItem.questionnaireItem)
+    textInputLayout.hint = questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
+    displayValidationResult(questionnaireViewItem.validationResult)
 
     textInputEditText.removeTextChangedListener(textWatcher)
-    updateUI(questionnaireItemViewItem, textInputEditText, textInputLayout)
+    updateUI(questionnaireViewItem, textInputEditText, textInputLayout)
 
     textWatcher =
       textInputEditText.doAfterTextChanged { editable: Editable? ->
-        handleInput(editable!!, questionnaireItemViewItem)
+        handleInput(editable!!, questionnaireViewItem)
       }
   }
 
@@ -107,11 +108,11 @@ abstract class QuestionnaireItemEditTextViewHolderDelegate(private val rawInputT
   }
 
   /** Handles user input from the `editable` and updates the questionnaire. */
-  abstract fun handleInput(editable: Editable, questionnaireItemViewItem: QuestionnaireItemViewItem)
+  abstract fun handleInput(editable: Editable, questionnaireViewItem: QuestionnaireViewItem)
 
   /** Handles the UI update. */
   abstract fun updateUI(
-    questionnaireItemViewItem: QuestionnaireItemViewItem,
+    questionnaireViewItem: QuestionnaireViewItem,
     textInputEditText: TextInputEditText,
     textInputLayout: TextInputLayout,
   )
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
similarity index 73%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
index f11353ba50..ce7916f559 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.Button
@@ -25,16 +25,18 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.GroupHeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemGroupViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_group_header_view) {
+internal object GroupViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.group_header_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireGroupTypeHeaderView
+      private lateinit var header: GroupHeaderView
       private lateinit var error: TextView
       private lateinit var addItemButton: Button
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -42,21 +44,20 @@ internal object QuestionnaireItemGroupViewHolderFactory :
         addItemButton = itemView.findViewById(R.id.add_item)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        header.bind(questionnaireViewItem.questionnaireItem)
         addItemButton.visibility =
-          if (questionnaireItemViewItem.questionnaireItem.repeats) View.VISIBLE else View.GONE
+          if (questionnaireViewItem.questionnaireItem.repeats) View.VISIBLE else View.GONE
         addItemButton.setOnClickListener {
-          questionnaireItemViewItem.addAnswer(
+          questionnaireViewItem.addAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
               // TODO(jingtang10): This can be removed since we already do this in the
               // answerChangedCallback in the QuestionnaireViewModel.
-              item =
-                questionnaireItemViewItem.questionnaireItem.getNestedQuestionnaireResponseItems()
+              item = questionnaireViewItem.questionnaireItem.getNestedQuestionnaireResponseItems()
             }
           )
         }
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
similarity index 75%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
index d6f29c2f21..bc85c2efa3 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuestionnaireItemViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.LayoutInflater
 import android.view.View
@@ -22,6 +22,8 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.views.MediaView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 
 /**
  * Factory for [QuestionnaireItemViewHolder].
@@ -44,7 +46,7 @@ abstract class QuestionnaireItemViewHolderFactory(@LayoutRes open val resId: Int
 }
 
 /**
- * The [RecyclerView.ViewHolder] for [QuestionnaireItemViewItem].
+ * The [RecyclerView.ViewHolder] for [QuestionnaireViewItem].
  *
  * This is used by [QuestionnaireItemAdapter] to initialize views and bind items in [RecyclerView].
  */
@@ -53,18 +55,18 @@ open class QuestionnaireItemViewHolder(
   private val delegate: QuestionnaireItemViewHolderDelegate
 ) : RecyclerView.ViewHolder(itemView) {
 
-  private var itemMediaView: QuestionnaireItemMediaView
+  private var itemMediaView: MediaView
 
   init {
     delegate.init(itemView)
     itemMediaView = itemView.findViewById(R.id.item_media)
   }
 
-  open fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-    delegate.questionnaireItemViewItem = questionnaireItemViewItem
-    delegate.bind(questionnaireItemViewItem)
-    itemMediaView.bind(questionnaireItemViewItem.questionnaireItem)
-    delegate.setReadOnly(questionnaireItemViewItem.questionnaireItem.readOnly)
+  open fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+    delegate.questionnaireViewItem = questionnaireViewItem
+    delegate.bind(questionnaireViewItem)
+    itemMediaView.bind(questionnaireViewItem.questionnaireItem)
+    delegate.setReadOnly(questionnaireViewItem.questionnaireItem.readOnly)
   }
 }
 
@@ -80,7 +82,7 @@ open class QuestionnaireItemViewHolder(
  */
 interface QuestionnaireItemViewHolderDelegate {
 
-  var questionnaireItemViewItem: QuestionnaireItemViewItem
+  var questionnaireViewItem: QuestionnaireViewItem
 
   /**
    * Initializes the view in [QuestionnaireItemViewHolder]. Any listeners to record user input
@@ -89,10 +91,10 @@ interface QuestionnaireItemViewHolderDelegate {
   fun init(itemView: View)
 
   /**
-   * Binds a [QuestionnaireItemViewItem] to the view. This should update the UI to display the
-   * question, the answer, and any validation result.
+   * Binds a [QuestionnaireViewItem] to the view. This should update the UI to display the question,
+   * the answer, and any validation result.
    */
-  fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem)
+  fun bind(questionnaireViewItem: QuestionnaireViewItem)
 
   /** Sets view read only if [isReadOnly] is true. */
   fun setReadOnly(isReadOnly: Boolean)
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
similarity index 85%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
index 1963f5aea1..0b20ce3210 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.LayoutInflater
 import android.view.View
@@ -32,17 +32,19 @@ import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemRadioGroupViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_radio_group_view) {
+internal object RadioGroupViewHolderFactory :
+  QuestionnaireItemViewHolderFactory(R.layout.radio_group_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var radioGroup: ConstraintLayout
       private lateinit var flow: Flow
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -50,8 +52,8 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
         flow = itemView.findViewById(R.id.flow)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        val questionnaireItem = questionnaireItemViewItem.questionnaireItem
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        val questionnaireItem = questionnaireViewItem.questionnaireItem
         header.bind(questionnaireItem)
         // Keep the Flow layout which is the first child
         radioGroup.removeViews(1, radioGroup.childCount - 1)
@@ -67,12 +69,12 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
             flow.setWrapMode(Flow.WRAP_NONE)
           }
         }
-        questionnaireItemViewItem.answerOption
+        questionnaireViewItem.answerOption
           .map { answerOption -> View.generateViewId() to answerOption }
           .onEach { populateViewWithAnswerOption(it.first, it.second, choiceOrientation) }
           .map { it.first }
           .let { flow.referencedIds = it.toIntArray() }
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
@@ -99,9 +101,8 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
         choiceOrientation: ChoiceOrientationTypes
       ) {
         val radioButtonItem =
-          LayoutInflater.from(radioGroup.context)
-            .inflate(R.layout.questionnaire_item_radio_button, null)
-        var isCurrentlySelected = questionnaireItemViewItem.isAnswerOptionSelected(answerOption)
+          LayoutInflater.from(radioGroup.context).inflate(R.layout.radio_button, null)
+        var isCurrentlySelected = questionnaireViewItem.isAnswerOptionSelected(answerOption)
         val radioButton =
           radioButtonItem.findViewById<RadioButton>(R.id.radio_button).apply {
             id = viewId
@@ -130,7 +131,7 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
                   buttons.forEach { button -> uncheckIfNotButtonId(radioButton.id, button) }
                 }
                 false -> {
-                  questionnaireItemViewItem.clearAnswer()
+                  questionnaireViewItem.clearAnswer()
                   (radioButton as RadioButton).isChecked = false
                 }
               }
@@ -145,7 +146,7 @@ internal object QuestionnaireItemRadioGroupViewHolderFactory :
       }
 
       private fun updateAnswer(answerOption: Questionnaire.QuestionnaireItemAnswerOptionComponent) {
-        questionnaireItemViewItem.setAnswer(
+        questionnaireViewItem.setAnswer(
           QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
             value = answerOption.value
           }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
similarity index 75%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
index abe996be70..ae81f99fb8 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.view.View.GONE
@@ -22,22 +22,23 @@ import android.view.View.VISIBLE
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.divider.MaterialDivider
 import org.hl7.fhir.r4.model.Questionnaire
 
 /**
  * This view is a container that contains the question and answer obtained from
- * questionnaireItemViewItem [QuestionnaireItemViewItem].
+ * questionnaireItemViewItem [QuestionnaireViewItem].
  */
-internal object QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_simple_question_answer_view) {
+internal object ReviewViewHolderFactory : QuestionnaireItemViewHolderFactory(R.layout.review_view) {
   override fun getQuestionnaireItemViewHolderDelegate() =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var flyOverTextView: TextView
       private lateinit var answerTextView: TextView
       private lateinit var divider: MaterialDivider
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -46,10 +47,10 @@ internal object QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory :
         divider = itemView.findViewById(R.id.text_divider)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        header.bind(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        header.bind(questionnaireViewItem.questionnaireItem)
         val localizedFlyoverSpanned =
-          questionnaireItemViewItem.questionnaireItem.localizedFlyoverSpanned
+          questionnaireViewItem.questionnaireItem.localizedFlyoverSpanned
         flyOverTextView.apply {
           visibility =
             if (localizedFlyoverSpanned.isNullOrEmpty()) {
@@ -62,12 +63,12 @@ internal object QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory :
 
         answerTextView.apply {
           visibility =
-            when (questionnaireItemViewItem.questionnaireItem.type) {
+            when (questionnaireViewItem.questionnaireItem.type) {
               Questionnaire.QuestionnaireItemType.GROUP,
               Questionnaire.QuestionnaireItemType.DISPLAY -> GONE
               else -> VISIBLE
             }
-          text = questionnaireItemViewItem.answerString(context)
+          text = questionnaireViewItem.answerString(context)
         }
 
         divider.visibility =
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
similarity index 78%
rename from datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactory.kt
rename to datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
index 2f8c24548a..beab9d7d0b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.TextView
@@ -26,19 +26,20 @@ import com.google.android.fhir.datacapture.validation.MinValueConstraintValidato
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
 import com.google.android.fhir.datacapture.validation.ValidationResult
+import com.google.android.fhir.datacapture.views.HeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.slider.Slider
 import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
-internal object QuestionnaireItemSliderViewHolderFactory :
-  QuestionnaireItemViewHolderFactory(R.layout.questionnaire_item_slider) {
+internal object SliderViewHolderFactory : QuestionnaireItemViewHolderFactory(R.layout.slider_view) {
   override fun getQuestionnaireItemViewHolderDelegate(): QuestionnaireItemViewHolderDelegate =
     object : QuestionnaireItemViewHolderDelegate {
-      private lateinit var header: QuestionnaireItemHeaderView
+      private lateinit var header: HeaderView
       private lateinit var slider: Slider
       private lateinit var error: TextView
-      override lateinit var questionnaireItemViewItem: QuestionnaireItemViewItem
+      override lateinit var questionnaireViewItem: QuestionnaireViewItem
 
       override fun init(itemView: View) {
         header = itemView.findViewById(R.id.header)
@@ -46,12 +47,12 @@ internal object QuestionnaireItemSliderViewHolderFactory :
         error = itemView.findViewById(R.id.error)
       }
 
-      override fun bind(questionnaireItemViewItem: QuestionnaireItemViewItem) {
-        this.questionnaireItemViewItem = questionnaireItemViewItem
-        header.bind(questionnaireItemViewItem.questionnaireItem)
-        val answer = questionnaireItemViewItem.answers.singleOrNull()
-        val minValue = getMinValue(questionnaireItemViewItem.questionnaireItem)
-        val maxValue = getMaxValue(questionnaireItemViewItem.questionnaireItem)
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        this.questionnaireViewItem = questionnaireViewItem
+        header.bind(questionnaireViewItem.questionnaireItem)
+        val answer = questionnaireViewItem.answers.singleOrNull()
+        val minValue = getMinValue(questionnaireViewItem.questionnaireItem)
+        val maxValue = getMaxValue(questionnaireViewItem.questionnaireItem)
         if (minValue >= maxValue) {
           throw IllegalStateException("minValue $minValue must be smaller than maxValue $maxValue")
         }
@@ -61,21 +62,20 @@ internal object QuestionnaireItemSliderViewHolderFactory :
           valueFrom = minValue
           valueTo = maxValue
           stepSize =
-            (questionnaireItemViewItem.questionnaireItem.sliderStepValue
-                ?: SLIDER_DEFAULT_STEP_SIZE)
+            (questionnaireViewItem.questionnaireItem.sliderStepValue ?: SLIDER_DEFAULT_STEP_SIZE)
               .toFloat()
           value = answer?.valueIntegerType?.value?.toFloat() ?: valueFrom
 
           addOnChangeListener { _, newValue, _ ->
             // Responds to when slider's value is changed
-            questionnaireItemViewItem.setAnswer(
+            questionnaireViewItem.setAnswer(
               QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
                 .setValue(IntegerType(newValue.toInt()))
             )
           }
         }
 
-        displayValidationResult(questionnaireItemViewItem.validationResult)
+        displayValidationResult(questionnaireViewItem.validationResult)
       }
 
       private fun displayValidationResult(validationResult: ValidationResult) {
diff --git a/datacapture/src/main/res/layout/questionnaire_item_attachment_view.xml b/datacapture/src/main/res/layout/attachment_view.xml
similarity index 97%
rename from datacapture/src/main/res/layout/questionnaire_item_attachment_view.xml
rename to datacapture/src/main/res/layout/attachment_view.xml
index 939c429905..9108bc34af 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_attachment_view.xml
+++ b/datacapture/src/main/res/layout/attachment_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/item_margin_horizontal"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_boolean_type_picker_view.xml b/datacapture/src/main/res/layout/boolean_choice_view.xml
similarity index 95%
rename from datacapture/src/main/res/layout/questionnaire_item_boolean_type_picker_view.xml
rename to datacapture/src/main/res/layout/boolean_choice_view.xml
index afbb53f731..08f33cd651 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_boolean_type_picker_view.xml
+++ b/datacapture/src/main/res/layout/boolean_choice_view.xml
@@ -24,14 +24,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_check_box_view.xml b/datacapture/src/main/res/layout/check_box_view.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_check_box_view.xml
rename to datacapture/src/main/res/layout/check_box_view.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_checkbox_group_view.xml b/datacapture/src/main/res/layout/checkbox_group_view.xml
similarity index 93%
rename from datacapture/src/main/res/layout/questionnaire_item_checkbox_group_view.xml
rename to datacapture/src/main/res/layout/checkbox_group_view.xml
index 80c5f35479..50611f1e88 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_checkbox_group_view.xml
+++ b/datacapture/src/main/res/layout/checkbox_group_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_date_picker_view.xml b/datacapture/src/main/res/layout/date_picker_view.xml
similarity index 93%
rename from datacapture/src/main/res/layout/questionnaire_item_date_picker_view.xml
rename to datacapture/src/main/res/layout/date_picker_view.xml
index 5b55591961..bdbcddf670 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_date_picker_view.xml
+++ b/datacapture/src/main/res/layout/date_picker_view.xml
@@ -20,14 +20,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_date_time_picker_view.xml b/datacapture/src/main/res/layout/date_time_picker_view.xml
similarity index 96%
rename from datacapture/src/main/res/layout/questionnaire_item_date_time_picker_view.xml
rename to datacapture/src/main/res/layout/date_time_picker_view.xml
index 48148715f4..3a66e9d3a8 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_date_time_picker_view.xml
+++ b/datacapture/src/main/res/layout/date_time_picker_view.xml
@@ -24,14 +24,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_display_view.xml b/datacapture/src/main/res/layout/display_view.xml
similarity index 89%
rename from datacapture/src/main/res/layout/questionnaire_item_display_view.xml
rename to datacapture/src/main/res/layout/display_view.xml
index 813120e1be..2b4db5e1a5 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_display_view.xml
+++ b/datacapture/src/main/res/layout/display_view.xml
@@ -23,13 +23,13 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_drop_down_list_item.xml b/datacapture/src/main/res/layout/drop_down_list_item.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_drop_down_list_item.xml
rename to datacapture/src/main/res/layout/drop_down_list_item.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml b/datacapture/src/main/res/layout/drop_down_view.xml
similarity index 92%
rename from datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml
rename to datacapture/src/main/res/layout/drop_down_view.xml
index c02e901ffd..ab013976d7 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml
+++ b/datacapture/src/main/res/layout/drop_down_view.xml
@@ -20,14 +20,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_auto_complete_view.xml b/datacapture/src/main/res/layout/edit_text_auto_complete_view.xml
similarity index 95%
rename from datacapture/src/main/res/layout/questionnaire_item_edit_text_auto_complete_view.xml
rename to datacapture/src/main/res/layout/edit_text_auto_complete_view.xml
index f3fb12fb28..91ec4f4e28 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_edit_text_auto_complete_view.xml
+++ b/datacapture/src/main/res/layout/edit_text_auto_complete_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_multi_line_view.xml b/datacapture/src/main/res/layout/edit_text_multi_line_view.xml
similarity index 92%
rename from datacapture/src/main/res/layout/questionnaire_item_edit_text_multi_line_view.xml
rename to datacapture/src/main/res/layout/edit_text_multi_line_view.xml
index 235e9358f5..8dd1486787 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_edit_text_multi_line_view.xml
+++ b/datacapture/src/main/res/layout/edit_text_multi_line_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_single_line_view.xml b/datacapture/src/main/res/layout/edit_text_single_line_view.xml
similarity index 92%
rename from datacapture/src/main/res/layout/questionnaire_item_edit_text_single_line_view.xml
rename to datacapture/src/main/res/layout/edit_text_single_line_view.xml
index 70caa5c8f6..50e2f2fb2c 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_edit_text_single_line_view.xml
+++ b/datacapture/src/main/res/layout/edit_text_single_line_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_group_header_view.xml b/datacapture/src/main/res/layout/group_header_view.xml
similarity index 93%
rename from datacapture/src/main/res/layout/questionnaire_item_group_header_view.xml
rename to datacapture/src/main/res/layout/group_header_view.xml
index 819f0dea37..1e83b296e9 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_group_header_view.xml
+++ b/datacapture/src/main/res/layout/group_header_view.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
     >
-        <com.google.android.fhir.datacapture.views.QuestionnaireGroupTypeHeaderView
+        <com.google.android.fhir.datacapture.views.GroupHeaderView
             android:id="@+id/header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         />
     </LinearLayout>
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_group_type_header.xml b/datacapture/src/main/res/layout/group_type_header_view.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_group_type_header.xml
rename to datacapture/src/main/res/layout/group_type_header_view.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_header.xml b/datacapture/src/main/res/layout/header_view.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_header.xml
rename to datacapture/src/main/res/layout/header_view.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_media.xml b/datacapture/src/main/res/layout/media_view.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_media.xml
rename to datacapture/src/main/res/layout/media_view.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml b/datacapture/src/main/res/layout/multi_select_dialog.xml
similarity index 97%
rename from datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml
rename to datacapture/src/main/res/layout/multi_select_dialog.xml
index 80d48c9c51..2683d55b68 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml
+++ b/datacapture/src/main/res/layout/multi_select_dialog.xml
@@ -46,7 +46,7 @@
         android:layout_marginTop="@dimen/padding_default"
         android:scrollbars="vertical"
         android:layout_weight="1"
-        tools:listitem="@layout/questionnaire_item_option_item_multi"
+        tools:listitem="@layout/option_item_multi"
     />
 
     <LinearLayout
diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_multi.xml b/datacapture/src/main/res/layout/option_item_multi.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_option_item_multi.xml
rename to datacapture/src/main/res/layout/option_item_multi.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_other_add_another.xml b/datacapture/src/main/res/layout/option_item_other_add_another.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_option_item_other_add_another.xml
rename to datacapture/src/main/res/layout/option_item_other_add_another.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_other_text.xml b/datacapture/src/main/res/layout/option_item_other_text.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_option_item_other_text.xml
rename to datacapture/src/main/res/layout/option_item_other_text.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_single.xml b/datacapture/src/main/res/layout/option_item_single.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_option_item_single.xml
rename to datacapture/src/main/res/layout/option_item_single.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_select_view.xml b/datacapture/src/main/res/layout/option_select_view.xml
similarity index 92%
rename from datacapture/src/main/res/layout/questionnaire_item_option_select_view.xml
rename to datacapture/src/main/res/layout/option_select_view.xml
index 917f0d0e1b..c9dc32e30d 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_option_select_view.xml
+++ b/datacapture/src/main/res/layout/option_select_view.xml
@@ -24,14 +24,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_radio_button.xml b/datacapture/src/main/res/layout/radio_button.xml
similarity index 100%
rename from datacapture/src/main/res/layout/questionnaire_item_radio_button.xml
rename to datacapture/src/main/res/layout/radio_button.xml
diff --git a/datacapture/src/main/res/layout/questionnaire_item_radio_group_view.xml b/datacapture/src/main/res/layout/radio_group_view.xml
similarity index 93%
rename from datacapture/src/main/res/layout/questionnaire_item_radio_group_view.xml
rename to datacapture/src/main/res/layout/radio_group_view.xml
index 28e189e341..1e42aff32e 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_radio_group_view.xml
+++ b/datacapture/src/main/res/layout/radio_group_view.xml
@@ -24,14 +24,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_simple_question_answer_view.xml b/datacapture/src/main/res/layout/review_view.xml
similarity index 92%
rename from datacapture/src/main/res/layout/questionnaire_item_simple_question_answer_view.xml
rename to datacapture/src/main/res/layout/review_view.xml
index 67dfb2c359..01887d8bde 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_simple_question_answer_view.xml
+++ b/datacapture/src/main/res/layout/review_view.xml
@@ -22,13 +22,13 @@
     android:layout_marginTop="@dimen/item_margin_vertical"
     android:orientation="vertical"
 >
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/main/res/layout/questionnaire_item_slider.xml b/datacapture/src/main/res/layout/slider_view.xml
similarity index 91%
rename from datacapture/src/main/res/layout/questionnaire_item_slider.xml
rename to datacapture/src/main/res/layout/slider_view.xml
index 12d9fcb66c..a132900dfc 100644
--- a/datacapture/src/main/res/layout/questionnaire_item_slider.xml
+++ b/datacapture/src/main/res/layout/slider_view.xml
@@ -23,14 +23,14 @@
     android:orientation="vertical"
 >
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemHeaderView
+    <com.google.android.fhir.datacapture.views.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_default"
     />
 
-    <com.google.android.fhir.datacapture.views.QuestionnaireItemMediaView
+    <com.google.android.fhir.datacapture.views.MediaView
         android:id="@+id/item_media"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapterTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
similarity index 77%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapterTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
index 26c1909879..8e523a7384 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemEditAdapterTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireEditAdapterTest.kt
@@ -19,8 +19,8 @@ package com.google.android.fhir.datacapture
 import android.os.Build
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
@@ -41,14 +41,14 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class QuestionnaireItemEditAdapterTest {
+class QuestionnaireEditAdapterTest {
   @Test
   fun getItemViewType_groupItemType_shouldReturnGroupViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.GROUP),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -59,17 +59,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.GROUP.value)
   }
 
   @Test
   fun getItemViewType_booleanItemType_shouldReturnBooleanViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.BOOLEAN),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -80,17 +80,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.BOOLEAN_TYPE_PICKER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.BOOLEAN_TYPE_PICKER.value)
   }
 
   @Test
   fun getItemViewType_dateItemType_shouldReturnDatePickerViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.DATE),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -101,23 +101,23 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.DATE_PICKER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DATE_PICKER.value)
   }
 
   @Test
   fun getItemViewType_dateItemType_answerOption_shouldReturnDropDownViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItemComponent =
       Questionnaire.QuestionnaireItemComponent().apply {
         type = Questionnaire.QuestionnaireItemType.DATE
         answerOption =
           listOf(Questionnaire.QuestionnaireItemAnswerOptionComponent(DateType("2022-06-22")))
       }
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItemComponent,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -127,17 +127,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.RADIO_GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.RADIO_GROUP.value)
   }
 
   @Test
   fun getItemViewType_dateTimeItemType_shouldReturnDateTimePickerViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.DATETIME),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -148,17 +148,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.DATE_TIME_PICKER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DATE_TIME_PICKER.value)
   }
 
   @Test
   fun getItemViewType_stringItemType_shouldReturnEditTextViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.STRING),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -169,13 +169,13 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.EDIT_TEXT_SINGLE_LINE.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.EDIT_TEXT_SINGLE_LINE.value)
   }
 
   @Test
   fun getItemViewType_stringItemType_androidItemControlExtension_shouldReturnPhoneNumberViewHolderType() { // ktlint-disable max-line-length
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItem =
       Questionnaire.QuestionnaireItemComponent().setType(Questionnaire.QuestionnaireItemType.STRING)
     questionnaireItem.addExtension(
@@ -190,10 +190,10 @@ class QuestionnaireItemEditAdapterTest {
             )
         )
     )
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItem,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -203,23 +203,23 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.PHONE_NUMBER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.PHONE_NUMBER.value)
   }
 
   @Test
   fun getItemViewType_stringItemType_answerOption_shouldReturnDropDownViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItemComponent =
       Questionnaire.QuestionnaireItemComponent().apply {
         type = Questionnaire.QuestionnaireItemType.STRING
         answerOption =
           listOf(Questionnaire.QuestionnaireItemAnswerOptionComponent(StringType("option-1")))
       }
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItemComponent,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -229,17 +229,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.RADIO_GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.RADIO_GROUP.value)
   }
 
   @Test
   fun getItemViewType_textItemType_shouldReturnEditTextViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.TEXT),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -250,17 +250,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.EDIT_TEXT_MULTI_LINE.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.EDIT_TEXT_MULTI_LINE.value)
   }
 
   @Test
   fun getItemViewType_integerItemType_shouldReturnEditTextIntegerViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.INTEGER),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -271,13 +271,13 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.EDIT_TEXT_INTEGER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.EDIT_TEXT_INTEGER.value)
   }
 
   @Test
   fun getItemViewType_integerItemType_itemControlExtensionWithSlider_shouldReturnSliderViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItem =
       Questionnaire.QuestionnaireItemComponent()
         .setType(Questionnaire.QuestionnaireItemType.INTEGER)
@@ -294,10 +294,10 @@ class QuestionnaireItemEditAdapterTest {
             )
         )
     )
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItem,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -307,23 +307,23 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.SLIDER.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.SLIDER.value)
   }
 
   @Test
   fun getItemViewType_integerItemType_answerOption_shouldReturnDropDownViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItemComponent =
       Questionnaire.QuestionnaireItemComponent().apply {
         type = Questionnaire.QuestionnaireItemType.INTEGER
         answerOption =
           listOf(Questionnaire.QuestionnaireItemAnswerOptionComponent(IntegerType("1")))
       }
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItemComponent,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -333,17 +333,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.RADIO_GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.RADIO_GROUP.value)
   }
 
   @Test
   fun getItemViewType_decimalItemType_shouldReturnEditTextDecimalViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.DECIMAL),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -354,17 +354,17 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.EDIT_TEXT_DECIMAL.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.EDIT_TEXT_DECIMAL.value)
   }
 
   @Test
   fun getItemViewType_choiceItemType_lessAnswerOptions_shouldReturnRadioGroupViewHolderType() {
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.CHOICE),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -375,22 +375,22 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.RADIO_GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.RADIO_GROUP.value)
   }
 
   @Test
   fun getItemViewType_choiceItemType_moreAnswerOptions_shouldReturnDropDownViewHolderType() {
     val answerOptions =
-      List(QuestionnaireItemEditAdapter.MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN) {
+      List(QuestionnaireEditAdapter.MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN) {
         Questionnaire.QuestionnaireItemAnswerOptionComponent()
           .setValue(Coding().setCode("test-code").setDisplay("Test Code"))
       }
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
-    questionnaireItemEditAdapter.submitList(
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.CHOICE)
               .setAnswerOption(answerOptions),
@@ -402,18 +402,18 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.DROP_DOWN.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DROP_DOWN.value)
   }
 
   @Test
   fun getItemViewType_choiceItemType_itemControlExtensionWithRadioButton_shouldReturnRadioGroupViewHolder() { // ktlint-disable max-line-length
     val answerOptions =
-      List(QuestionnaireItemEditAdapter.MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN) {
+      List(QuestionnaireEditAdapter.MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN) {
         Questionnaire.QuestionnaireItemAnswerOptionComponent()
           .setValue(Coding().setCode("test-code").setDisplay("Test Code"))
       }
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItem =
       Questionnaire.QuestionnaireItemComponent()
         .setType(Questionnaire.QuestionnaireItemType.CHOICE)
@@ -431,10 +431,10 @@ class QuestionnaireItemEditAdapterTest {
             )
         )
     )
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItem,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -444,13 +444,13 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.RADIO_GROUP.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.RADIO_GROUP.value)
   }
 
   @Test
   fun getItemViewType_choiceItemType_itemControlExtensionWithDropDown_shouldReturnDropDownViewHolderType() { // ktlint-disable max-line-length
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter()
+    val questionnaireEditAdapter = QuestionnaireEditAdapter()
     val questionnaireItem =
       Questionnaire.QuestionnaireItemComponent().setType(Questionnaire.QuestionnaireItemType.CHOICE)
     questionnaireItem.addExtension(
@@ -466,10 +466,10 @@ class QuestionnaireItemEditAdapterTest {
             )
         )
     )
-    questionnaireItemEditAdapter.submitList(
+    questionnaireEditAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             questionnaireItem,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -479,8 +479,8 @@ class QuestionnaireItemEditAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemEditAdapter.getItemViewType(0))
-      .isEqualTo(QuestionnaireItemViewHolderType.DROP_DOWN.value)
+    assertThat(questionnaireEditAdapter.getItemViewType(0))
+      .isEqualTo(QuestionnaireViewHolderType.DROP_DOWN.value)
   }
 
   // TODO: test errors thrown for unsupported types
@@ -494,7 +494,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areItemsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -502,7 +502,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               otherQuestionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -522,7 +522,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areItemsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -530,7 +530,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               otherQuestionnaireResponseItem,
               validationResult = NotValidated,
@@ -549,7 +549,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areItemsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -557,7 +557,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -578,7 +578,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -586,7 +586,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               otherQuestionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -606,7 +606,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -614,7 +614,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               otherQuestionnaireResponseItem,
               validationResult = NotValidated,
@@ -633,7 +633,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -641,7 +641,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
                 questionnaireItem,
                 questionnaireResponseItem,
                 validationResult = NotValidated,
@@ -667,7 +667,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -675,7 +675,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = Invalid(listOf()),
@@ -694,7 +694,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -702,7 +702,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -721,7 +721,7 @@ class QuestionnaireItemEditAdapterTest {
     assertThat(
         DiffCallbacks.ITEMS.areContentsTheSame(
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -729,7 +729,7 @@ class QuestionnaireItemEditAdapterTest {
             )
           ),
           QuestionnaireAdapterItem.Question(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -744,11 +744,11 @@ class QuestionnaireItemEditAdapterTest {
   @Test
   fun onCreateViewHolder_customViewType_shouldReturnCorrectCustomViewHolder() {
     val viewFactoryMatchers = getQuestionnaireItemViewHolderFactoryMatchers()
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter(viewFactoryMatchers)
+    val questionnaireEditAdapter = QuestionnaireEditAdapter(viewFactoryMatchers)
     assertThat(
-        questionnaireItemEditAdapter.onCreateViewHolder(
+        questionnaireEditAdapter.onCreateViewHolder(
           mock(),
-          QuestionnaireItemViewHolderType.values().size
+          QuestionnaireViewHolderType.values().size
         )
       )
       .isEqualTo(viewFactoryMatchers[0].factory.create(mock()))
@@ -757,21 +757,21 @@ class QuestionnaireItemEditAdapterTest {
   @Test
   fun onCreateViewHolder_customViewType_shouldThrowExceptionForInvalidWidgetType() {
     val viewFactoryMatchers = getQuestionnaireItemViewHolderFactoryMatchers()
-    val questionnaireItemEditAdapter = QuestionnaireItemEditAdapter(viewFactoryMatchers)
+    val questionnaireEditAdapter = QuestionnaireEditAdapter(viewFactoryMatchers)
     assertThrows(IllegalStateException::class.java) {
-      QuestionnaireItemEditAdapter(getQuestionnaireItemViewHolderFactoryMatchers())
-      questionnaireItemEditAdapter.onCreateViewHolder(
+      QuestionnaireEditAdapter(getQuestionnaireItemViewHolderFactoryMatchers())
+      questionnaireEditAdapter.onCreateViewHolder(
         mock(),
-        QuestionnaireItemViewHolderType.values().size + viewFactoryMatchers.size
+        QuestionnaireViewHolderType.values().size + viewFactoryMatchers.size
       )
     }
   }
 
   @Test
   fun getItemViewTypeMapping_customViewType_shouldReturnCorrectIntValue() {
-    val expectedItemViewType = QuestionnaireItemViewHolderType.values().size
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val expectedItemViewType = QuestionnaireViewHolderType.values().size
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           type = Questionnaire.QuestionnaireItemType.DATE
         },
@@ -782,8 +782,8 @@ class QuestionnaireItemEditAdapterTest {
 
     assertThat(expectedItemViewType)
       .isEqualTo(
-        QuestionnaireItemEditAdapter(getQuestionnaireItemViewHolderFactoryMatchers())
-          .getItemViewTypeForQuestion(questionnaireItemViewItem)
+        QuestionnaireEditAdapter(getQuestionnaireItemViewHolderFactoryMatchers())
+          .getItemViewTypeForQuestion(questionnaireViewItem)
       )
   }
 
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
index cda04c1590..f6c490eaa3 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
@@ -30,7 +30,7 @@ import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_QUESTIONNAIRE_JSON_STRING
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_SHOW_REVIEW_PAGE_FIRST
 import com.google.android.fhir.datacapture.testing.DataCaptureTestApplication
-import com.google.android.fhir.datacapture.views.QuestionnaireItemDateTimePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.factories.DateTimePickerViewHolderFactory
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Questionnaire
 import org.junit.Before
@@ -244,7 +244,7 @@ class QuestionnaireFragmentTest {
     override fun get(): List<QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher> {
       return listOf(
         QuestionnaireFragment.QuestionnaireItemViewHolderFactoryMatcher(
-          factory = QuestionnaireItemDateTimePickerViewHolderFactory,
+          factory = DateTimePickerViewHolderFactory,
           matches = { true }
         )
       )
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapterTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapterTest.kt
similarity index 73%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapterTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapterTest.kt
index 6f37a9f8aa..39ba84a70e 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemReviewAdapterTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireReviewAdapterTest.kt
@@ -18,7 +18,7 @@ package com.google.android.fhir.datacapture
 
 import android.os.Build
 import com.google.android.fhir.datacapture.validation.Valid
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -29,22 +29,22 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class QuestionnaireItemReviewAdapterTest {
+class QuestionnaireReviewAdapterTest {
   @Test
   fun `submitting empty list to adapter should return itemCount zero`() {
-    val questionnaireItemReviewAdapter = QuestionnaireItemReviewAdapter()
-    questionnaireItemReviewAdapter.submitList(listOf())
+    val questionnaireReviewAdapter = QuestionnaireReviewAdapter()
+    questionnaireReviewAdapter.submitList(listOf())
 
-    assertThat(questionnaireItemReviewAdapter.itemCount).isEqualTo(0)
+    assertThat(questionnaireReviewAdapter.itemCount).isEqualTo(0)
   }
 
   @Test
   fun `submitting single items to adapter should return itemCount one`() {
-    val questionnaireItemReviewAdapter = QuestionnaireItemReviewAdapter()
-    questionnaireItemReviewAdapter.submitList(
+    val questionnaireReviewAdapter = QuestionnaireReviewAdapter()
+    questionnaireReviewAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.GROUP),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -55,16 +55,16 @@ class QuestionnaireItemReviewAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemReviewAdapter.itemCount).isEqualTo(1)
+    assertThat(questionnaireReviewAdapter.itemCount).isEqualTo(1)
   }
 
   @Test
   fun `submitting multiple items to adapter should return itemCount greater than zero`() {
-    val questionnaireItemReviewAdapter = QuestionnaireItemReviewAdapter()
-    questionnaireItemReviewAdapter.submitList(
+    val questionnaireReviewAdapter = QuestionnaireReviewAdapter()
+    questionnaireReviewAdapter.submitList(
       listOf(
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.GROUP),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -73,7 +73,7 @@ class QuestionnaireItemReviewAdapterTest {
           )
         ),
         QuestionnaireAdapterItem.Question(
-          QuestionnaireItemViewItem(
+          QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent()
               .setType(Questionnaire.QuestionnaireItemType.DISPLAY),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
@@ -84,7 +84,7 @@ class QuestionnaireItemReviewAdapterTest {
       )
     )
 
-    assertThat(questionnaireItemReviewAdapter.itemCount).isEqualTo(2)
-    assertThat(questionnaireItemReviewAdapter.itemCount).isGreaterThan(0)
+    assertThat(questionnaireReviewAdapter.itemCount).isEqualTo(2)
+    assertThat(questionnaireReviewAdapter.itemCount).isGreaterThan(0)
   }
 }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderTypeTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderTypeTest.kt
similarity index 80%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderTypeTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderTypeTest.kt
index 401cbd014c..7b971501fb 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderTypeTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewHolderTypeTest.kt
@@ -25,16 +25,16 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class QuestionnaireItemViewHolderTypeTest {
+class QuestionnaireViewHolderTypeTest {
   @Test
   fun size_shouldReturnNumberOfQuestionnaireViewHolderTypes() {
-    assertThat(QuestionnaireItemViewHolderType.values().size).isEqualTo(18)
+    assertThat(QuestionnaireViewHolderType.values().size).isEqualTo(18)
   }
 
   @Test
   fun fromInt_shouldReturnQuestionnaireViewHolderType() {
-    QuestionnaireItemViewHolderType.values().forEach {
-      assertThat(QuestionnaireItemViewHolderType.fromInt(it.value)).isEqualTo(it)
+    QuestionnaireViewHolderType.values().forEach {
+      assertThat(QuestionnaireViewHolderType.fromInt(it.value)).isEqualTo(it)
     }
   }
 }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
index cfa732c60b..7e17bd6d13 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt
@@ -32,10 +32,13 @@ import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_SHOW_REVIEW_PAGE_FIRST
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_SHOW_SUBMIT_BUTTON
 import com.google.android.fhir.datacapture.common.datatype.asStringValue
+import com.google.android.fhir.datacapture.extensions.EXTENSION_ENTRY_MODE_URL
+import com.google.android.fhir.datacapture.extensions.EntryMode
+import com.google.android.fhir.datacapture.extensions.entryMode
 import com.google.android.fhir.datacapture.testing.DataCaptureTestApplication
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.fhir.testing.FhirEngineProviderTestRule
 import com.google.common.truth.Truth.assertThat
 import java.util.Calendar
@@ -4024,7 +4027,7 @@ class QuestionnaireViewModelTest {
   private fun QuestionnaireViewModel.getQuestionnaireItemViewItemList() =
     questionnaireStateFlow.value.items
 
-  private fun QuestionnaireItemViewItem.getQuestionnaireResponseItem() =
+  private fun QuestionnaireViewItem.getQuestionnaireResponseItem() =
     ReflectionHelpers.getField<QuestionnaireResponse.QuestionnaireResponseItemComponent>(
       this,
       "questionnaireResponseItem"
@@ -4074,10 +4077,10 @@ class QuestionnaireViewModelTest {
   }
 }
 
-private fun QuestionnaireAdapterItem.asQuestion(): QuestionnaireItemViewItem {
+private fun QuestionnaireAdapterItem.asQuestion(): QuestionnaireViewItem {
   assertThat(this).isInstanceOf(QuestionnaireAdapterItem.Question::class.java)
   return (this as QuestionnaireAdapterItem.Question).item
 }
 
-private fun QuestionnaireAdapterItem.asQuestionOrNull(): QuestionnaireItemViewItem? =
+private fun QuestionnaireAdapterItem.asQuestionOrNull(): QuestionnaireViewItem? =
   (this as? QuestionnaireAdapterItem.Question)?.item
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreContextsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreContextsTest.kt
similarity index 92%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreContextsTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreContextsTest.kt
index 49495ce823..6f6badd55e 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreContextsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreContextsTest.kt
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.extensions
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ContextThemeWrapper
+import com.google.android.fhir.datacapture.tryUnwrapContext
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtilTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreEnumerationsTest.kt
similarity index 65%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtilTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreEnumerationsTest.kt
index 61b2f47195..fb11b1470c 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreReflectionUtilTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreEnumerationsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,33 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.extensions
 
+import com.google.android.fhir.datacapture.invokeFunction
+import com.google.android.fhir.datacapture.toCoding
 import com.google.common.truth.Truth.assertThat
+import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.Enumeration
+import org.hl7.fhir.r4.model.Enumerations
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class MoreReflectionUtilTest {
+class MoreEnumerationsTest {
+
+  @Test
+  fun enumeration_should_return_coding() {
+    val maleEnumerationCoding =
+      Enumeration(Enumerations.AdministrativeGenderEnumFactory(), "male").toCoding()
+    val coding =
+      Coding().apply {
+        display = "Male"
+        code = "male"
+        system = "http://hl7.org/fhir/administrative-gender"
+      }
+    assertThat(maleEnumerationCoding.equalsShallow(coding)).isTrue()
+  }
 
   @Test
   fun invokeFunction_shouldWorkWithNoArgs() {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreExpressionsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreExpressionsTest.kt
similarity index 91%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreExpressionsTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreExpressionsTest.kt
index 3ac0a140cf..afeded4f9a 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreExpressionsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreExpressionsTest.kt
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
 import android.os.Build
+import com.google.android.fhir.datacapture.isFhirPath
+import com.google.android.fhir.datacapture.isXFhirQuery
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Expression
 import org.junit.Test
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimesTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimesTest.kt
index e17f1a1c2f..a4f3a1cc38 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDateTimesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDateTimesTest.kt
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.extensions
 
 import android.os.Build
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.toLocalizedTimeString
 import com.google.common.truth.Truth.assertThat
 import java.time.LocalDate
 import java.time.LocalDateTime
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDatesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
similarity index 91%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDatesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
index 1094443538..59e2e12464 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalDatesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.extensions
 
 import android.os.Build
-import com.google.android.fhir.datacapture.views.getLocalizedDateTimePattern
+import com.google.android.fhir.datacapture.canonicalizeDatePattern
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.getDateSeparator
+import com.google.android.fhir.datacapture.parseDate
+import com.google.android.fhir.datacapture.views.factories.getLocalizedDateTimePattern
 import com.google.common.truth.Truth.assertThat
 import java.text.ParseException
 import java.time.LocalDate
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimesTest.kt
similarity index 95%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimesTest.kt
index 7f3e2ad3f5..f5f2f0adce 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreLocalTimesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalTimesTest.kt
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.extensions
 
 import android.os.Build
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.toLocalizedString
 import com.google.common.truth.Truth.assertThat
 import java.time.LocalTime
 import java.util.Locale
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemAnswerOptionComponent.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemAnswerOptionComponentsTest.kt
similarity index 96%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemAnswerOptionComponent.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemAnswerOptionComponentsTest.kt
index d6ef06df1c..c9dfb032fa 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemAnswerOptionComponent.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemAnswerOptionComponentsTest.kt
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
 import android.app.Application
 import android.os.Build
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.EXTENSION_OPTION_EXCLUSIVE_URL
 import com.google.android.fhir.datacapture.common.datatype.displayString
+import com.google.android.fhir.datacapture.optionExclusive
 import com.google.common.truth.Truth.assertThat
 import java.util.Locale
 import kotlin.test.assertFailsWith
@@ -41,7 +43,7 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class MoreQuestionnaireItemAnswerOptionComponent {
+class MoreQuestionnaireItemAnswerOptionComponentsTest {
 
   private val context = ApplicationProvider.getApplicationContext<Application>()
 
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
index 25b42bc56a..813b80dfc7 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponentsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt
@@ -14,13 +14,68 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
 import android.graphics.Bitmap
 import android.os.Build
 import android.util.Base64
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.ChoiceColumn
+import com.google.android.fhir.datacapture.ChoiceOrientationTypes
+import com.google.android.fhir.datacapture.DataCapture
+import com.google.android.fhir.datacapture.DisplayItemControlType
+import com.google.android.fhir.datacapture.EXTENSION_ANSWER_EXPRESSION_URL
+import com.google.android.fhir.datacapture.EXTENSION_CALCULATED_EXPRESSION_URL
+import com.google.android.fhir.datacapture.EXTENSION_CHOICE_COLUMN_URL
+import com.google.android.fhir.datacapture.EXTENSION_CHOICE_ORIENTATION_URL
+import com.google.android.fhir.datacapture.EXTENSION_DISPLAY_CATEGORY_SYSTEM
+import com.google.android.fhir.datacapture.EXTENSION_DISPLAY_CATEGORY_URL
+import com.google.android.fhir.datacapture.EXTENSION_ENABLE_WHEN_EXPRESSION_URL
+import com.google.android.fhir.datacapture.EXTENSION_ENTRY_FORMAT_URL
+import com.google.android.fhir.datacapture.EXTENSION_HIDDEN_URL
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL_ANDROID_FHIR
+import com.google.android.fhir.datacapture.EXTENSION_MAX_SIZE
+import com.google.android.fhir.datacapture.EXTENSION_MIME_TYPE
+import com.google.android.fhir.datacapture.EXTENSION_SLIDER_STEP_VALUE_URL
+import com.google.android.fhir.datacapture.INSTRUCTIONS
+import com.google.android.fhir.datacapture.ItemControlTypes
+import com.google.android.fhir.datacapture.MimeType
+import com.google.android.fhir.datacapture.answerExpression
+import com.google.android.fhir.datacapture.calculatedExpression
+import com.google.android.fhir.datacapture.choiceColumn
+import com.google.android.fhir.datacapture.choiceOrientation
+import com.google.android.fhir.datacapture.createQuestionnaireResponseItem
+import com.google.android.fhir.datacapture.decodeToBitmap
+import com.google.android.fhir.datacapture.displayItemControl
+import com.google.android.fhir.datacapture.enableWhenExpression
+import com.google.android.fhir.datacapture.entryFormat
+import com.google.android.fhir.datacapture.expressionBasedExtensions
+import com.google.android.fhir.datacapture.extractAnswerOptions
+import com.google.android.fhir.datacapture.fetchBitmapFromUrl
+import com.google.android.fhir.datacapture.flattened
+import com.google.android.fhir.datacapture.hasHelpButton
+import com.google.android.fhir.datacapture.hasMimeType
+import com.google.android.fhir.datacapture.hasMimeTypeOnly
+import com.google.android.fhir.datacapture.isFlyoverCode
+import com.google.android.fhir.datacapture.isGivenSizeOverLimit
+import com.google.android.fhir.datacapture.isHelpCode
+import com.google.android.fhir.datacapture.isInstructionsCode
+import com.google.android.fhir.datacapture.isReferencedBy
+import com.google.android.fhir.datacapture.itemControl
+import com.google.android.fhir.datacapture.localizedFlyoverSpanned
+import com.google.android.fhir.datacapture.localizedHelpSpanned
+import com.google.android.fhir.datacapture.localizedInstructionsSpanned
+import com.google.android.fhir.datacapture.localizedPrefixSpanned
+import com.google.android.fhir.datacapture.localizedTextSpanned
 import com.google.android.fhir.datacapture.mapping.ITEM_INITIAL_EXPRESSION_URL
+import com.google.android.fhir.datacapture.maxSizeInBytes
+import com.google.android.fhir.datacapture.maxSizeInKiBs
+import com.google.android.fhir.datacapture.maxSizeInMiBs
+import com.google.android.fhir.datacapture.mimeTypes
+import com.google.android.fhir.datacapture.sliderStepValue
 import com.google.android.fhir.datacapture.testing.DataCaptureTestApplication
 import com.google.android.fhir.datacapture.testing.TestUrlResolver
 import com.google.common.truth.Truth.assertThat
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemAnswerComponentTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemAnswerComponentsTest.kt
similarity index 97%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemAnswerComponentTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemAnswerComponentsTest.kt
index 5bac5a59b7..160d8cb034 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemAnswerComponentTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemAnswerComponentsTest.kt
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
 import android.app.Application
 import android.os.Build
 import androidx.test.core.app.ApplicationProvider
+import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.common.datatype.displayString
-import com.google.android.fhir.datacapture.utilities.format
-import com.google.android.fhir.datacapture.utilities.toLocalizedString
+import com.google.android.fhir.datacapture.format
+import com.google.android.fhir.datacapture.hasDifferentAnswerSet
+import com.google.android.fhir.datacapture.toLocalizedString
 import com.google.common.truth.Truth.assertThat
 import java.time.LocalDate
 import java.time.LocalTime
@@ -46,7 +48,7 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class MoreQuestionnaireResponseItemAnswerComponentTest {
+class MoreQuestionnaireResponseItemAnswerComponentsTest {
   private val context = ApplicationProvider.getApplicationContext<Application>()
 
   @Test
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemComponentsTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemComponentsTest.kt
similarity index 95%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemComponentsTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemComponentsTest.kt
index 9b586ef173..96755a51f0 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponseItemComponentsTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponseItemComponentsTest.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
+import com.google.android.fhir.datacapture.descendant
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponsesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
similarity index 95%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponsesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
index 6c64659a88..1e4bbaaf35 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnaireResponsesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
+import com.google.android.fhir.datacapture.allItems
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnairesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesTest.kt
similarity index 93%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnairesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesTest.kt
index 0435448d2a..2b2fa5b074 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/MoreQuestionnairesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesTest.kt
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture
+package com.google.android.fhir.datacapture.extensions
 
+import com.google.android.fhir.datacapture.DisplayItemControlType
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_SYSTEM
+import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.CodeableConcept
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/common/datatype/MoreTypesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreTypesTest.kt
similarity index 83%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/common/datatype/MoreTypesTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreTypesTest.kt
index d33bb86061..0201c46b97 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/common/datatype/MoreTypesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreTypesTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.common.datatype
+package com.google.android.fhir.datacapture.extensions
 
 import android.os.Build
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum
+import com.google.android.fhir.datacapture.common.datatype.asStringValue
+import com.google.android.fhir.datacapture.common.datatype.toCodeType
+import com.google.android.fhir.datacapture.common.datatype.toIdType
+import com.google.android.fhir.datacapture.common.datatype.toUriType
 import com.google.common.truth.Truth.assertThat
 import java.time.Instant
 import java.time.ZoneId
@@ -27,6 +31,7 @@ import org.hl7.fhir.r4.model.Base64BinaryType
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.CodeType
+import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.DecimalType
 import org.hl7.fhir.r4.model.IdType
@@ -36,6 +41,7 @@ import org.hl7.fhir.r4.model.MarkdownType
 import org.hl7.fhir.r4.model.OidType
 import org.hl7.fhir.r4.model.PositiveIntType
 import org.hl7.fhir.r4.model.Quantity
+import org.hl7.fhir.r4.model.StringType
 import org.hl7.fhir.r4.model.TimeType
 import org.hl7.fhir.r4.model.Type
 import org.hl7.fhir.r4.model.UnsignedIntType
@@ -169,4 +175,27 @@ class MoreTypesTest {
     val value = Quantity(1234567.89)
     assertThat((value as Type).asStringValue()).isEqualTo("")
   }
+  @Test
+  fun stringType_toUriType() {
+    val uri = StringType("fakeUri").toUriType()
+    assertThat(uri.equalsDeep(UriType("fakeUri"))).isTrue()
+  }
+
+  @Test
+  fun stringType_toCodeType() {
+    val code = StringType("fakeCode").toCodeType()
+    assertThat(code.equalsDeep(CodeType("fakeCode"))).isTrue()
+  }
+
+  @Test
+  fun stringType_toIdType() {
+    val id = StringType("fakeId").toIdType()
+    assertThat(id.equalsDeep(IdType("fakeId"))).isTrue()
+  }
+
+  @Test
+  fun coding_toCodeType() {
+    val code = Coding("fakeSystem", "fakeCode", "fakeDisplay").toCodeType()
+    assertThat(code.equalsDeep(CodeType("fakeCode"))).isTrue()
+  }
 }
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
index 6a8114af23..325e3b87e5 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.fhirpath
 import com.google.android.fhir.datacapture.EXTENSION_CALCULATED_EXPRESSION_URL
 import com.google.android.fhir.datacapture.EXTENSION_VARIABLE_URL
 import com.google.android.fhir.datacapture.common.datatype.asStringValue
+import com.google.android.fhir.datacapture.extensions.variableExpressions
 import com.google.android.fhir.datacapture.fhirpath.ExpressionEvaluator.detectExpressionCyclicDependency
 import com.google.android.fhir.datacapture.fhirpath.ExpressionEvaluator.evaluateCalculatedExpressions
 import com.google.android.fhir.datacapture.variableExpressions
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/FhirPathUtilTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtilTest.kt
similarity index 96%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/FhirPathUtilTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtilTest.kt
index 6cce391dec..6668d4cd18 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/FhirPathUtilTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/fhirpath/FhirPathUtilTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.utilities
+package com.google.android.fhir.datacapture.fhirpath
 
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.HumanName
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
index 7da7175750..4e8f15c582 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
@@ -22,7 +22,7 @@ import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import ca.uhn.fhir.parser.IParser
-import com.google.android.fhir.datacapture.views.localDate
+import com.google.android.fhir.datacapture.views.factories.localDate
 import com.google.common.truth.Truth.assertThat
 import java.math.BigDecimal
 import java.text.SimpleDateFormat
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreEnumerationTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreEnumerationTest.kt
deleted file mode 100644
index 5de84663cd..0000000000
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/MoreEnumerationTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.utilities
-
-import com.google.common.truth.Truth.assertThat
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.Enumeration
-import org.hl7.fhir.r4.model.Enumerations
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class MoreEnumerationTest {
-
-  @Test
-  fun enumeration_should_return_coding() {
-    val maleEnumerationCoding =
-      Enumeration(Enumerations.AdministrativeGenderEnumFactory(), "male").toCoding()
-    val coding =
-      Coding().apply {
-        display = "Male"
-        code = "male"
-        system = "http://hl7.org/fhir/administrative-gender"
-      }
-    assertThat(maleEnumerationCoding.equalsShallow(coding)).isTrue()
-  }
-}
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtilTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtilTest.kt
deleted file mode 100644
index 179bcabf9d..0000000000
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/utilities/TypeConversionUtilTest.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.utilities
-
-import com.google.common.truth.Truth.assertThat
-import org.hl7.fhir.r4.model.CodeType
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.IdType
-import org.hl7.fhir.r4.model.StringType
-import org.hl7.fhir.r4.model.UriType
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class TypeConversionUtilTest {
-
-  @Test
-  fun stringType_toUriType() {
-    val uri = StringType("fakeUri").toUriType()
-    assertThat(uri.equalsDeep(UriType("fakeUri"))).isTrue()
-  }
-
-  @Test
-  fun stringType_toCodeType() {
-    val code = StringType("fakeCode").toCodeType()
-    assertThat(code.equalsDeep(CodeType("fakeCode"))).isTrue()
-  }
-
-  @Test
-  fun stringType_toIdType() {
-    val id = StringType("fakeId").toIdType()
-    assertThat(id.equalsDeep(IdType("fakeId"))).isTrue()
-  }
-
-  @Test
-  fun coding_toCodeType() {
-    val code = Coding("fakeSystem", "fakeCode", "fakeDisplay").toCodeType()
-    assertThat(code.equalsDeep(CodeType("fakeCode"))).isTrue()
-  }
-}
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderViewTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
similarity index 98%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderViewTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
index e7c32a7151..49aa169a0b 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireGroupTypeHeaderViewTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/GroupHeaderViewTest.kt
@@ -40,12 +40,12 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireGroupTypeHeaderViewTest {
+class GroupHeaderViewTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val view = QuestionnaireGroupTypeHeaderView(parent.context, null)
+  private val view = GroupHeaderView(parent.context, null)
 
   @Test
   fun shouldShowPrefix() {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderViewTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
similarity index 98%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderViewTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
index 44311fc4dc..ac91afbbbe 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemHeaderViewTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/HeaderViewTest.kt
@@ -40,12 +40,12 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemHeaderViewTest {
+class HeaderViewTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val view = QuestionnaireItemHeaderView(parent.context, null)
+  private val view = HeaderView(parent.context, null)
 
   @Test
   fun shouldShowPrefix() {
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItemTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
similarity index 89%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItemTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
index 087fc50b66..e5bded6d02 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItemTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireViewItemTest.kt
@@ -38,13 +38,13 @@ import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
-class QuestionnaireItemViewItemTest {
+class QuestionnaireViewItemTest {
   private val context = ApplicationProvider.getApplicationContext<Application>()
 
   @Test
   fun `addAnswer() should throw exception if question does not allow repeated answers`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { linkId = "a-question" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -58,7 +58,7 @@ class QuestionnaireItemViewItemTest {
 
     val errorMessage =
       assertFailsWith<IllegalStateException> {
-          questionnaireItemViewItem.addAnswer(
+          questionnaireViewItem.addAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
               .setValue(BooleanType(true))
           )
@@ -72,8 +72,8 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `addAnswer() should add answer to QuestionnaireResponseItem`() {
     var answers = listOf<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>()
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -88,7 +88,7 @@ class QuestionnaireItemViewItemTest {
         answersChangedCallback = { _, _, result, _ -> answers = result },
       )
 
-    questionnaireItemViewItem.addAnswer(
+    questionnaireViewItem.addAnswer(
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().setValue(BooleanType(true))
     )
 
@@ -97,8 +97,8 @@ class QuestionnaireItemViewItemTest {
 
   @Test
   fun `removeAnswer() should throw exception if question does not allow repeated answers`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { linkId = "a-question" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -116,7 +116,7 @@ class QuestionnaireItemViewItemTest {
 
     val errorMessage =
       assertFailsWith<IllegalStateException> {
-          questionnaireItemViewItem.removeAnswer(
+          questionnaireViewItem.removeAnswer(
             QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
               .setValue(BooleanType(true))
           )
@@ -130,8 +130,8 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `removeAnswer() should remove answer from QuestionnaireResponseItem`() {
     var answers = listOf<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>()
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -154,7 +154,7 @@ class QuestionnaireItemViewItemTest {
         answersChangedCallback = { _, _, result, _ -> answers = result },
       )
 
-    questionnaireItemViewItem.removeAnswer(
+    questionnaireViewItem.removeAnswer(
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().setValue(BooleanType(false))
     )
 
@@ -163,8 +163,8 @@ class QuestionnaireItemViewItemTest {
 
   @Test
   fun hasAnswerOption_questionnaireItemRepeats_shouldReturnTrue() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -188,7 +188,7 @@ class QuestionnaireItemViewItemTest {
       )
 
     assertThat(
-        questionnaireItemViewItem.isAnswerOptionSelected(
+        questionnaireViewItem.isAnswerOptionSelected(
           Questionnaire.QuestionnaireItemAnswerOptionComponent()
             .setValue(Coding("sample-system", "sample-code2", "Sample Code2"))
         )
@@ -198,8 +198,8 @@ class QuestionnaireItemViewItemTest {
 
   @Test
   fun hasAnswerOption_questionnaireItemRepeats_shouldReturnFalse() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -218,7 +218,7 @@ class QuestionnaireItemViewItemTest {
       )
 
     assertThat(
-        questionnaireItemViewItem.isAnswerOptionSelected(
+        questionnaireViewItem.isAnswerOptionSelected(
           Questionnaire.QuestionnaireItemAnswerOptionComponent()
             .setValue(Coding("sample-system", "sample-code2", "Sample Code2"))
         )
@@ -231,14 +231,14 @@ class QuestionnaireItemViewItemTest {
     val questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent()
 
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             questionnaireResponseItem,
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameItem(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -254,14 +254,14 @@ class QuestionnaireItemViewItemTest {
     val questionnaireItem = Questionnaire.QuestionnaireItemComponent()
 
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             questionnaireItem,
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameItem(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = NotValidated,
@@ -278,14 +278,14 @@ class QuestionnaireItemViewItemTest {
     val questionnaireResponseItem = QuestionnaireResponse.QuestionnaireResponseItemComponent()
 
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             questionnaireItem,
             questionnaireResponseItem,
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameItem(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               questionnaireItem,
               questionnaireResponseItem,
               validationResult = NotValidated,
@@ -299,7 +299,7 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return false for different answer list sizes`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
               addAnswer(
@@ -312,7 +312,7 @@ class QuestionnaireItemViewItemTest {
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = NotValidated,
@@ -326,14 +326,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return true for two empty answer lists`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = NotValidated,
@@ -347,7 +347,7 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return false for different answers`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
               addAnswer(
@@ -360,7 +360,7 @@ class QuestionnaireItemViewItemTest {
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
                 addAnswer(
@@ -380,7 +380,7 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return false for null and non-null answers`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -388,7 +388,7 @@ class QuestionnaireItemViewItemTest {
           )
           .apply { setAnswer(QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()) }
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
                 addAnswer(
@@ -408,7 +408,7 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return false for non-null and null answers`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
               addAnswer(
@@ -421,7 +421,7 @@ class QuestionnaireItemViewItemTest {
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
                 Questionnaire.QuestionnaireItemComponent(),
                 QuestionnaireResponse.QuestionnaireResponseItemComponent(),
                 validationResult = NotValidated,
@@ -436,7 +436,7 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameAnswer() should return true for the same answers`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
@@ -450,7 +450,7 @@ class QuestionnaireItemViewItemTest {
             )
           }
           .hasTheSameAnswer(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
                 Questionnaire.QuestionnaireItemComponent(),
                 QuestionnaireResponse.QuestionnaireResponseItemComponent(),
                 validationResult = NotValidated,
@@ -471,14 +471,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return true for null validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = NotValidated,
@@ -492,14 +492,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return true for null and valid validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = NotValidated,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = Valid,
@@ -513,14 +513,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return false for valid and null validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = Valid,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = NotValidated,
@@ -534,14 +534,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return true for two valid validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = Valid,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = Valid,
@@ -555,14 +555,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return false for different validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = Valid,
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = Invalid(listOf("error")),
@@ -576,14 +576,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return false for validation results with different messages`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = Invalid(listOf("error 1")),
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = Invalid(listOf("error 2")),
@@ -597,14 +597,14 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `hasTheSameValidationResult() should return true for same validation results`() {
     assertThat(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
             Questionnaire.QuestionnaireItemComponent(),
             QuestionnaireResponse.QuestionnaireResponseItemComponent(),
             validationResult = Invalid(listOf("error")),
             answersChangedCallback = { _, _, _, _ -> }
           )
           .hasTheSameValidationResult(
-            QuestionnaireItemViewItem(
+            QuestionnaireViewItem(
               Questionnaire.QuestionnaireItemComponent(),
               QuestionnaireResponse.QuestionnaireResponseItemComponent(),
               validationResult = Invalid(listOf("error")),
@@ -617,21 +617,21 @@ class QuestionnaireItemViewItemTest {
 
   @Test
   fun `answerString() should return not answered with no answer`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Valid,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    assertThat(questionnaireItemViewItem.answerString(context))
+    assertThat(questionnaireViewItem.answerString(context))
       .isEqualTo(context.getString(R.string.not_answered))
   }
 
   @Test
   fun `answerString() should return answer value with single answer`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -641,13 +641,13 @@ class QuestionnaireItemViewItemTest {
         validationResult = Valid,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    assertThat(questionnaireItemViewItem.answerString(context)).isEqualTo("Answer")
+    assertThat(questionnaireViewItem.answerString(context)).isEqualTo("Answer")
   }
 
   @Test
   fun `answerString() should return comma separated answer value with multiple answers`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -661,15 +661,15 @@ class QuestionnaireItemViewItemTest {
         validationResult = Valid,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    assertThat(questionnaireItemViewItem.answerString(context)).isEqualTo("Answer1, Answer2")
+    assertThat(questionnaireViewItem.answerString(context)).isEqualTo("Answer1, Answer2")
   }
 
   @Test
   fun `update partial answer`() {
     var answers = listOf<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>()
     var partialAnswer: Any? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { linkId = "a-question" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -679,7 +679,7 @@ class QuestionnaireItemViewItemTest {
         },
       )
 
-    questionnaireItemViewItem.setDraftAnswer("02/02")
+    questionnaireViewItem.setDraftAnswer("02/02")
 
     assertThat(partialAnswer).isEqualTo("02/02")
     assertThat(answers).isEmpty()
@@ -689,8 +689,8 @@ class QuestionnaireItemViewItemTest {
   fun `no partial answer for addAnswer`() {
     var answers = listOf<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>()
     var partialAnswer: Any? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -703,7 +703,7 @@ class QuestionnaireItemViewItemTest {
         },
       )
 
-    questionnaireItemViewItem.addAnswer(
+    questionnaireViewItem.addAnswer(
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
         .setValue(DateType(2023, 1, 2))
     )
@@ -715,8 +715,8 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `no partial answer for removeAnswer`() {
     var partialAnswer: Any? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -726,7 +726,7 @@ class QuestionnaireItemViewItemTest {
         answersChangedCallback = { _, _, result, partialValue -> partialAnswer = partialValue },
       )
 
-    questionnaireItemViewItem.removeAnswer(
+    questionnaireViewItem.removeAnswer(
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
         .setValue(DateType(2023, 1, 2))
     )
@@ -737,8 +737,8 @@ class QuestionnaireItemViewItemTest {
   @Test
   fun `no partial answer for setAnswer`() {
     var partialAnswer: Any? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           linkId = "a-question"
@@ -748,7 +748,7 @@ class QuestionnaireItemViewItemTest {
         answersChangedCallback = { _, _, result, partialValue -> partialAnswer = partialValue },
       )
 
-    questionnaireItemViewItem.setAnswer(
+    questionnaireViewItem.setAnswer(
       QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent()
         .setValue(DateType(2023, 1, 2))
     )
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactoryTest.kt
similarity index 95%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactoryTest.kt
index 76b0a36380..cd91b5d881 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -25,6 +25,7 @@ import com.google.android.fhir.datacapture.common.datatype.displayString
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -37,17 +38,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
+class AutoCompleteViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemAutoCompleteViewHolderFactory.create(parent)
+  private val viewHolder = AutoCompleteViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -74,7 +75,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaireItem,
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -110,7 +111,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
         answerValueSet = "http://answwer-value-set-url"
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaireItem,
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -153,7 +154,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
           .setValue(Coding().setCode("test2-code").setDisplay("Test2 Code"))
       )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = false
           answerValueSet = "#ContainedValueSet"
@@ -185,7 +186,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -204,7 +205,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addAnswerOption(
@@ -234,7 +235,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -258,7 +259,7 @@ class QuestionnaireItemAutoCompleteViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaireItem,
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactoryTest.kt
similarity index 86%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactoryTest.kt
index 563342ddc8..4af17d04a1 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemBooleanTypePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/BooleanChoiceViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.widget.FrameLayout
 import android.widget.RadioButton
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.Questionnaire
@@ -32,17 +33,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
+class BooleanChoiceViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemBooleanTypePickerViewHolderFactory.create(parent)
+  private val viewHolder = BooleanChoiceViewHolderFactory.create(parent)
 
   @Test
   fun bind_shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           text = "Question?"
@@ -59,22 +60,22 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
 
   @Test
   fun noAnswer_shouldSetAnswerEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
 
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun noAnswer_shouldNotCheckYesOrNoRadioButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -90,8 +91,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
 
   @Test
   fun answerTrue_shouldSetAnswerTrue() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -102,15 +103,15 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
 
-    assertThat(questionnaireItemViewItem.answers.single().valueBooleanType.value).isTrue()
+    assertThat(questionnaireViewItem.answers.single().valueBooleanType.value).isTrue()
   }
 
   @Test
   fun answerTrue_shouldCheckYesRadioButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -131,8 +132,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
 
   @Test
   fun answerFalse_shouldSetAnswerFalse() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -143,15 +144,15 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
 
-    assertThat(questionnaireItemViewItem.answers.single().valueBooleanType.value).isFalse()
+    assertThat(questionnaireViewItem.answers.single().valueBooleanType.value).isFalse()
   }
 
   @Test
   fun answerFalse_shouldCheckNoRadioButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -173,14 +174,14 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun click_shouldSetAnswerTrue() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(answerHolder!!.single().valueBooleanType.value).isTrue()
@@ -189,14 +190,14 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun click_shouldSetAnswerFalse() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(answerHolder!!.single().valueBooleanType.value).isFalse()
@@ -205,8 +206,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun yesSelected_clickYes_shouldClearAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -218,7 +219,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(answerHolder).isEmpty()
@@ -226,8 +227,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
 
   @Test
   fun yesSelected_clickYes_shouldClearRadioButtons() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -239,7 +240,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).performClick()
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -251,8 +252,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun noSelected_clickNo_shouldClearAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -264,7 +265,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(answerHolder).isEmpty()
@@ -272,8 +273,8 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
 
   @Test
   fun noSelected_clickNo_shouldClearRadioButtons() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -285,7 +286,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<RadioButton>(R.id.no_radio_button).performClick()
 
     assertThat(viewHolder.itemView.findViewById<RadioButton>(R.id.yes_radio_button).isChecked)
@@ -297,7 +298,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -312,7 +313,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -333,7 +334,7 @@ class QuestionnaireItemBooleanTypePickerViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           text = "Question?"
           readOnly = true
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
similarity index 97%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
index 68107e5bc5..d2fc17812d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemCheckBoxGroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/CheckBoxGroupViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.ViewGroup
 import android.widget.CheckBox
@@ -29,6 +29,7 @@ import com.google.android.fhir.datacapture.EXTENSION_OPTION_EXCLUSIVE_URL
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.BooleanType
@@ -44,12 +45,12 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
+class CheckBoxGroupViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemCheckBoxGroupViewHolderFactory.create(parent)
+  private val viewHolder = CheckBoxGroupViewHolderFactory.create(parent)
 
   private val itemAnswerMediaExtension =
     Extension().apply {
@@ -66,7 +67,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun bind_shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           text = "Question?"
@@ -102,7 +103,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaire,
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -139,7 +140,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaire,
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -158,7 +159,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun bind_noAnswer_shouldLeaveCheckButtonsUnchecked() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -181,7 +182,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun bind_withImageInItemAnswerMediaExtension_shouldShowImageAfterCheckBox() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -208,7 +209,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun bind_answer_shouldSetCheckBoxButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -245,8 +246,8 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun click_shouldAddQuestionnaireResponseItemAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -263,7 +264,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     val checkBox = checkBoxGroup.getChildAt(1) as CheckBox
     checkBox.performClick()
@@ -274,8 +275,8 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun optionExclusiveAnswerOption_click_deselectsOtherAnswerOptions() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -302,7 +303,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     (checkBoxGroup.getChildAt(2) as CheckBox).performClick()
     (checkBoxGroup.getChildAt(1) as CheckBox).performClick()
@@ -313,8 +314,8 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun answerOption_click_deselectsOptionExclusiveAnswerOption() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           addAnswerOption(
@@ -342,7 +343,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     (checkBoxGroup.getChildAt(1) as CheckBox).performClick()
     (checkBoxGroup.getChildAt(2) as CheckBox).performClick()
@@ -353,8 +354,8 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun click_shouldRemoveQuestionnaireResponseItemAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           answerValueSet = "http://coding-value-set-url"
@@ -388,7 +389,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val checkBoxGroup = viewHolder.itemView.findViewById<ConstraintLayout>(R.id.checkbox_group)
     val checkBox = checkBoxGroup.getChildAt(1) as CheckBox
     checkBox.performClick()
@@ -399,7 +400,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           required = true
@@ -417,7 +418,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           required = true
@@ -446,7 +447,7 @@ class QuestionnaireItemCheckBoxGroupViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           repeats = true
           readOnly = true
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
index 39565c129c..6d421ade67 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDatePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import java.util.Locale
@@ -34,16 +35,16 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemDatePickerViewHolderFactoryTest {
+class DatePickerViewHolderFactoryTest {
   private val context =
     RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
   private val parent = FrameLayout(context)
-  private val viewHolder = QuestionnaireItemDatePickerViewHolderFactory.create(parent)
+  private val viewHolder = DatePickerViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -58,7 +59,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun shouldSetEmptyDateInput() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -72,7 +73,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun `should set text field empty when date field is initialized but answer date value is null`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -93,7 +94,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun shouldSetDateInput_localeUs() {
     setLocale(Locale.US)
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -111,7 +112,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun shouldSetDateInput_localeJp() {
     setLocale(Locale.JAPAN)
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -129,7 +130,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun shouldSetDateInput_localeEn() {
     setLocale(Locale.ENGLISH)
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -148,7 +149,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     setLocale(Locale.US)
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val item =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -170,7 +171,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     setLocale(Locale.JAPAN)
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val item =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -190,7 +191,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     setLocale(Locale.US)
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -210,7 +211,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun `do not clear the text field input for invalid date`() {
     setLocale(Locale.US)
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -232,7 +233,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
       listOf(QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent())
     setLocale(Locale.US)
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -257,7 +258,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     var partialValue: String? = "02/07"
     setLocale(Locale.US)
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -280,7 +281,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun `display partial answer in the text field of recycled items`() {
     setLocale(Locale.US)
     var questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -295,7 +296,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("11/19/2020")
 
     questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -311,7 +312,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   fun `display an answer in the text field of partially answered recycled item`() {
     setLocale(Locale.US)
     var questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -323,7 +324,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("02/07")
 
     questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -341,7 +342,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addExtension().apply {
@@ -371,7 +372,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -400,7 +401,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -415,7 +416,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -431,7 +432,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     setLocale(Locale.US)
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -445,7 +446,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("11/19/2020")
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -459,7 +460,7 @@ class QuestionnaireItemDatePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("11/19/2021")
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactoryTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactoryTest.kt
index fc0de94c58..1dc230a34b 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDateTimePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import java.util.Date
@@ -36,12 +37,12 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
+class DateTimePickerViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemDateTimePickerViewHolderFactory.create(parent)
+  private val viewHolder = DateTimePickerViewHolderFactory.create(parent)
 
   @Before
   fun setUp() {
@@ -52,7 +53,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -67,7 +68,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun shouldSetEmptyDateTimeInput() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -82,7 +83,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun shouldSetDateTimeInput() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -102,7 +103,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   fun `parse date text input in US locale`() {
     var draftAnswer: Any? = null
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -123,7 +124,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     Locale.setDefault(Locale.JAPAN)
     var draftAnswer: Any? = null
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -144,7 +145,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   fun `if date input is invalid then clear the answer`() {
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -163,7 +164,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `do not clear the textField input on invalid date`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -184,7 +185,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? =
       listOf(QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent())
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -208,7 +209,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
         .setValue(DateTimeType(Date(2020 - 1900, 2, 6, 2, 30, 0)))
     var draft: String? = "02/07"
     val questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -228,7 +229,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `display draft answer in the text field of recycled items`() {
     var questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -243,7 +244,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("02/05/2020")
 
     questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -258,7 +259,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `display an answer in the text field of partially answered recycled item`() {
     var questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -270,7 +271,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     assertThat(viewHolder.dateInputView.text.toString()).isEqualTo("02/07")
 
     questionnaireItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -288,7 +289,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `if draft answer input is invalid then do not enable time text input layout`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -305,7 +306,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `if the draft answer input is empty, do not enable the time text input layout`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -322,7 +323,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `if there is no answer or draft answer, do not enable the time text input layout`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -339,7 +340,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `if date draft answer is valid then enable time text input layout`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -356,7 +357,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -371,7 +372,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -402,7 +403,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `if the draft answer is invalid, display the error message`() {
     val itemViewItem =
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -419,7 +420,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -434,7 +435,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -450,7 +451,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
   fun `bind multiple times with separate QuestionnaireItemViewItem should show proper date and time`() {
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -466,7 +467,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("1:30 AM")
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -482,7 +483,7 @@ class QuestionnaireItemDateTimePickerViewHolderFactoryTest {
     assertThat(viewHolder.timeInputView.text.toString()).isEqualTo("2:30 AM")
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactoryTest.kt
similarity index 87%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactoryTest.kt
index b48e36c400..8f432c78f5 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDisplayViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DisplayViewHolderFactoryTest.kt
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -30,17 +31,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemDisplayViewHolderFactoryTest {
+class DisplayViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemDisplayViewHolderFactory.create(parent)
+  private val viewHolder = DisplayViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Display" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -55,7 +56,7 @@ class QuestionnaireItemDisplayViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactoryTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactoryTest.kt
index 7eb37857b4..325d4d08bd 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemDropDownViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DropDownViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.AutoCompleteTextView
@@ -24,6 +24,7 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.common.datatype.displayString
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Coding
@@ -36,17 +37,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemDropDownViewHolderFactoryTest {
+class DropDownViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemDropDownViewHolderFactory.create(parent)
+  private val viewHolder = DropDownViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -65,7 +66,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
         value = Coding().setCode("test-code").setDisplay("Test Code")
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { addAnswerOption(answerOption) },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -90,7 +91,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
           }
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { addAnswerOption(answerOption) },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -111,7 +112,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
         value = Reference().apply { reference = "Patient/123" }
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { addAnswerOption(answerOption) },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -132,7 +133,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
         value = Coding().apply { code = "test-code" }
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { addAnswerOption(answerOption) },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -156,7 +157,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
           }
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { addAnswerOption(answerOption) },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -181,7 +182,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
           }
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           answerValueSet = "http://coding-value-set-url"
         },
@@ -213,7 +214,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -228,7 +229,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addAnswerOption(
@@ -255,7 +256,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -270,7 +271,7 @@ class QuestionnaireItemDropDownViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactoryTest.kt
similarity index 89%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactoryTest.kt
index a08775acf3..3b6e89b8b4 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextDecimalViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextDecimalViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -36,17 +37,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
+class EditTextDecimalViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemEditTextDecimalViewHolderFactory.create(parent)
+  private val viewHolder = EditTextDecimalViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -61,7 +62,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
   @Test
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -86,7 +87,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
   @Test
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -100,7 +101,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -121,43 +122,43 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).apply {
       setText("1.1")
       clearFocus()
     }
     viewHolder.itemView.clearFocus()
 
-    assertThat(questionnaireItemViewItem.answers.single().valueDecimalType.value)
+    assertThat(questionnaireViewItem.answers.single().valueDecimalType.value)
       .isEqualTo(BigDecimal("1.1"))
   }
 
   @Test
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers).isEmpty()
+    assertThat(questionnaireViewItem.answers).isEmpty()
   }
 
   @Test
   fun displayValidationResult_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -187,7 +188,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -217,7 +218,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -232,7 +233,7 @@ class QuestionnaireItemEditTextDecimalViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactoryTest.kt
similarity index 90%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactoryTest.kt
index 95154701d9..4633a1cfa9 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextIntegerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextIntegerViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -35,17 +36,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
+class EditTextIntegerViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemEditTextIntegerViewHolderFactory.create(parent)
+  private val viewHolder = EditTextIntegerViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -60,7 +61,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
   @Test
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -85,7 +86,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
   @Test
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -99,7 +100,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -120,40 +121,40 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("10")
 
-    val answer = questionnaireItemViewItem.answers
+    val answer = questionnaireViewItem.answers
     assertThat(answer.size).isEqualTo(1)
     assertThat(answer[0].valueIntegerType.value).isEqualTo(10)
   }
 
   @Test
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers.size).isEqualTo(0)
+    assertThat(questionnaireViewItem.answers.size).isEqualTo(0)
   }
 
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -183,7 +184,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -213,7 +214,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -228,7 +229,7 @@ class QuestionnaireItemEditTextIntegerViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactoryTest.kt
similarity index 89%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactoryTest.kt
index 97cd5408d0..c661165391 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextMultiLineViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextMultiLineViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -36,17 +37,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
+class EditTextMultiLineViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemEditTextMultiLineViewHolderFactory.create(parent)
+  private val viewHolder = EditTextMultiLineViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -61,7 +62,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
   @Test
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -86,7 +87,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
   @Test
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -100,7 +101,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -121,42 +122,42 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("Answer")
 
-    val answer = questionnaireItemViewItem.answers
+    val answer = questionnaireViewItem.answers
     assertThat(answer.size).isEqualTo(1)
     assertThat(answer[0].valueStringType.value).isEqualTo("Answer")
   }
 
   @Test
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers.size).isEqualTo(0)
+    assertThat(questionnaireViewItem.answers.size).isEqualTo(0)
   }
 
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minLength"
@@ -182,7 +183,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minLength"
@@ -211,7 +212,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -226,7 +227,7 @@ class QuestionnaireItemEditTextMultiLineViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactoryTest.kt
similarity index 88%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactoryTest.kt
index d21daccf03..dd23f7bdb3 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextQuantityViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextQuantityViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -23,6 +23,7 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -37,17 +38,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
+class EditTextQuantityViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemEditTextQuantityViewHolderFactory.create(parent)
+  private val viewHolder = EditTextQuantityViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -62,7 +63,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
   @Test
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -87,7 +88,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
   @Test
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -101,7 +102,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -122,18 +123,18 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("10")
     viewHolder.itemView.clearFocus()
 
-    val answer = questionnaireItemViewItem.answers
+    val answer = questionnaireViewItem.answers
     assertThat(answer.size).isEqualTo(1)
     assertThat(answer[0].valueQuantity!!.value!!.toString()).isEqualTo("10")
   }
@@ -143,40 +144,40 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswerOneDecimalPlace() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("10.1")
 
-    val answer = questionnaireItemViewItem.answers
+    val answer = questionnaireViewItem.answers
     assertThat(answer.size).isEqualTo(1)
     assertThat(answer[0].valueQuantity!!.value.toString()).isEqualTo("10.1")
   }
 
   @Test
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers.size).isEqualTo(0)
+    assertThat(questionnaireViewItem.answers.size).isEqualTo(0)
   }
 
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -191,7 +192,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -212,7 +213,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -227,7 +228,7 @@ class QuestionnaireItemEditTextQuantityViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactoryTest.kt
similarity index 89%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactoryTest.kt
index 6240b57f39..60bd9dd26e 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemEditTextSingleLineViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/EditTextSingleLineViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,7 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
@@ -36,17 +37,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
+class EditTextSingleLineViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemEditTextSingleLineViewHolderFactory.create(parent)
+  private val viewHolder = EditTextSingleLineViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -61,7 +62,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
   @Test
   fun shouldSetInputText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -85,7 +86,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
   @Test
   fun shouldSetInputTextToEmpty() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent()
           .addAnswer(
@@ -98,7 +99,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
       )
     )
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -119,42 +120,42 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
     "Needs to be moved to instrumentation tests https://github.com/google/android-fhir/issues/1494"
   )
   fun shouldSetQuestionnaireResponseItemAnswer() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("Answer")
 
-    val answer = questionnaireItemViewItem.answers
+    val answer = questionnaireViewItem.answers
     assertThat(answer.size).isEqualTo(1)
     assertThat(answer[0].valueStringType.value).isEqualTo("Answer")
   }
 
   @Test
   fun shouldSetQuestionnaireResponseItemAnswerToEmpty() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<TextInputEditText>(R.id.text_input_edit_text).setText("")
 
-    assertThat(questionnaireItemViewItem.answers.size).isEqualTo(0)
+    assertThat(questionnaireViewItem.answers.size).isEqualTo(0)
   }
 
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minLength"
@@ -180,7 +181,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minLength"
@@ -209,7 +210,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -224,7 +225,7 @@ class QuestionnaireItemEditTextSingleLineViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
similarity index 87%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
index 6e86a9de99..8db00d5bc5 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemGroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/GroupViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -22,6 +22,8 @@ import android.widget.TextView
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.GroupHeaderView
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Questionnaire
@@ -32,17 +34,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemGroupViewHolderFactoryTest {
+class GroupViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemGroupViewHolderFactory.create(parent)
+  private val viewHolder = GroupViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Group header" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -57,7 +59,7 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -72,7 +74,7 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addAnswerOption(
@@ -98,7 +100,7 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
   @Test
   fun hintText_nestedDisplayItem_shouldNotShowHintText() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           type = Questionnaire.QuestionnaireItemType.GROUP
           item =
@@ -118,14 +120,14 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
 
     assertThat(
         viewHolder.itemView
-          .findViewById<QuestionnaireGroupTypeHeaderView>(R.id.header)
+          .findViewById<GroupHeaderView>(R.id.header)
           .findViewById<TextView>(R.id.hint)
           .text.isNullOrEmpty()
       )
       .isTrue()
     assertThat(
         viewHolder.itemView
-          .findViewById<QuestionnaireGroupTypeHeaderView>(R.id.header)
+          .findViewById<GroupHeaderView>(R.id.header)
           .findViewById<TextView>(R.id.hint)
           .visibility
       )
@@ -135,23 +137,21 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
   @Test
   fun shouldHaveHeaderViewVisible() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Group header" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
     )
-    assertThat(
-        viewHolder.itemView.findViewById<QuestionnaireGroupTypeHeaderView>(R.id.header).visibility
-      )
+    assertThat(viewHolder.itemView.findViewById<GroupHeaderView>(R.id.header).visibility)
       .isEqualTo(View.VISIBLE)
   }
 
   @Test
   fun shouldSetHeaderViewVisibilityAsGone() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -159,16 +159,14 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
       )
     )
 
-    assertThat(
-        viewHolder.itemView.findViewById<QuestionnaireGroupTypeHeaderView>(R.id.header).visibility
-      )
+    assertThat(viewHolder.itemView.findViewById<GroupHeaderView>(R.id.header).visibility)
       .isEqualTo(View.GONE)
   }
 
   @Test
   fun repeatingGroup_shouldHaveAddItemButtonVisible() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { repeats = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -183,7 +181,7 @@ class QuestionnaireItemGroupViewHolderFactoryTest {
   @Test
   fun nonRepeatingGroup_shouldHaveAddItemButtonGone() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { repeats = false },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
similarity index 97%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
index 40fb0fb040..68eb2b3161 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemRadioGroupViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/RadioGroupViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -28,6 +28,7 @@ import com.google.android.fhir.datacapture.EXTENSION_ITEM_ANSWER_MEDIA
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.CodeType
@@ -42,12 +43,12 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemRadioGroupViewHolderFactoryTest {
+class RadioGroupViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemRadioGroupViewHolderFactory.create(parent)
+  private val viewHolder = RadioGroupViewHolderFactory.create(parent)
 
   private val itemAnswerMediaExtension =
     Extension().apply {
@@ -64,7 +65,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun bind_shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -96,7 +97,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaire,
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -132,7 +133,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         )
       }
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         questionnaire,
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -151,7 +152,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun bind_noAnswer_shouldLeaveRadioButtonsUnchecked() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -174,7 +175,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun bind_withImageInItemAnswerMediaExtension_shouldShowImageAfterRadioButtons() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -201,7 +202,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun bind_answer_shouldCheckRadioButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -243,8 +244,8 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun click_shouldSetQuestionnaireResponseItemAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -256,7 +257,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView
       .findViewById<ConstraintLayout>(R.id.radio_group)
       .getChildAt(1)
@@ -267,8 +268,8 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
 
   @Test
   fun click_shouldCheckRadioButton() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           answerValueSet = "http://coding-value-set-url"
         },
@@ -290,7 +291,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         validationResult = NotValidated,
         answersChangedCallback = { _, _, _, _ -> },
       )
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView
       .findViewById<ConstraintLayout>(R.id.radio_group)
       .getChildAt(1)
@@ -313,7 +314,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun click_shouldCheckOtherRadioButton() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -360,8 +361,8 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
 
   @Test
   fun `unselect radio button if selected radio button is clicked`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -374,7 +375,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val singleChoiceOption =
       viewHolder.itemView.findViewById<ConstraintLayout>(R.id.radio_group).getChildAt(1)
         as RadioButton
@@ -387,8 +388,8 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
 
   @Test
   fun `clear the answer if selected radio button is clicked`() {
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addAnswerOption(
             Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
@@ -401,20 +402,20 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     val singleChoiceOption =
       viewHolder.itemView.findViewById<ConstraintLayout>(R.id.radio_group).getChildAt(1)
         as RadioButton
     singleChoiceOption.performClick()
     singleChoiceOption.performClick()
 
-    assertThat(questionnaireItemViewItem.answers.isEmpty()).isTrue()
+    assertThat(questionnaireViewItem.answers.isEmpty()).isTrue()
   }
 
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { required = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Invalid(listOf("Missing answer for required field.")),
@@ -429,7 +430,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           required = true
           addAnswerOption(
@@ -457,7 +458,7 @@ class QuestionnaireItemRadioGroupViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           readOnly = true
           addAnswerOption(
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
similarity index 94%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
index 3fce2c099a..23d56d18cb 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/ReviewViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.app.Application
 import android.view.View
@@ -27,6 +27,7 @@ import com.google.android.fhir.datacapture.EXTENSION_ITEM_CONTROL_URL
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.divider.MaterialDivider
 import com.google.common.truth.Truth.assertThat
 import org.hl7.fhir.r4.model.BooleanType
@@ -39,18 +40,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
+class ReviewViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder =
-    QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactory.create(parent)
+  private val viewHolder = ReviewViewHolderFactory.create(parent)
 
   @Test
   fun `bind() should set question header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Valid,
@@ -65,7 +65,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set fly over text visibility gone`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -84,7 +84,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set fly over text`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -119,7 +119,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set answer text visibility gone when question type display`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -138,7 +138,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set answer text visibility gone when question type group`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -157,7 +157,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set answer text not answered when empty answer`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -178,7 +178,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set answer text when answered`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -202,7 +202,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should set divider visibility gone`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           type = Questionnaire.QuestionnaireItemType.DISPLAY
@@ -220,7 +220,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should show divider with header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = Valid,
@@ -235,7 +235,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should show divider with fly over text`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           text = "parent question text"
@@ -270,7 +270,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `bind() should show divider with answer`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "parent-question"
           type = Questionnaire.QuestionnaireItemType.BOOLEAN
@@ -293,7 +293,7 @@ class QuestionnaireItemSimpleQuestionAnswerDisplayViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactoryTest.kt
similarity index 93%
rename from datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactoryTest.kt
rename to datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactoryTest.kt
index 7e30f062e7..425790f1fa 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/QuestionnaireItemSliderViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/SliderViewHolderFactoryTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.fhir.datacapture.views
+package com.google.android.fhir.datacapture.views.factories
 
 import android.view.View
 import android.widget.FrameLayout
@@ -23,9 +23,9 @@ import com.google.android.fhir.datacapture.EXTENSION_SLIDER_STEP_VALUE_URL
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
 import com.google.android.material.slider.Slider
 import com.google.common.truth.Truth.assertThat
-import java.lang.IllegalStateException
 import kotlin.test.assertFailsWith
 import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.Questionnaire
@@ -36,17 +36,17 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
-class QuestionnaireItemSliderViewHolderFactoryTest {
+class SliderViewHolderFactoryTest {
   private val parent =
     FrameLayout(
       RuntimeEnvironment.getApplication().apply { setTheme(R.style.Theme_Material3_DayNight) }
     )
-  private val viewHolder = QuestionnaireItemSliderViewHolderFactory.create(parent)
+  private val viewHolder = SliderViewHolderFactory.create(parent)
 
   @Test
   fun shouldSetQuestionHeader() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -61,7 +61,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun shouldSetSliderValue() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -81,7 +81,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `step size should come from the sliderStepValue extension`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           linkId = "slider-step-value"
           addExtension(EXTENSION_SLIDER_STEP_VALUE_URL, IntegerType(10))
@@ -98,7 +98,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `step size should be 1 if the sliderStepValue extension is not present`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { linkId = "slider-step-value" },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -112,7 +112,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `slider valueTo should come from the maxValue extension`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/maxValue"
@@ -131,7 +131,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `slider valueTo should be set to default value if maxValue extension is not present`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -145,7 +145,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `slider valueFrom should come from the maxValue extension`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -164,7 +164,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `slider valueFrom should be set to default value if minValue extension is not present`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -179,7 +179,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   fun `throws exception if minValue is greater than maxvalue`() {
     assertFailsWith<IllegalStateException> {
       viewHolder.bind(
-        QuestionnaireItemViewItem(
+        QuestionnaireViewItem(
           Questionnaire.QuestionnaireItemComponent().apply {
             addExtension().apply {
               url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -201,15 +201,15 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun shouldSetQuestionnaireResponseSliderAnswer() {
     var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemViewItem =
-      QuestionnaireItemViewItem(
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
         answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
       )
 
-    viewHolder.bind(questionnaireItemViewItem)
+    viewHolder.bind(questionnaireViewItem)
     viewHolder.itemView.findViewById<Slider>(R.id.slider).value = 10.0F
 
     assertThat(answerHolder!!.single().valueIntegerType.value).isEqualTo(10)
@@ -218,7 +218,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun shouldSetSliderValueToDefault() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -243,7 +243,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun displayValidationResult_noError_shouldShowNoErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -272,7 +272,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun displayValidationResult_error_shouldShowErrorMessage() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"
@@ -302,7 +302,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `hides error textview in the header`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -317,7 +317,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun bind_readOnly_shouldDisableView() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { readOnly = true },
         QuestionnaireResponse.QuestionnaireResponseItemComponent(),
         validationResult = NotValidated,
@@ -331,7 +331,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
   @Test
   fun `bind multiple times with different QuestionnaireItemViewItem should show proper slider value`() {
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -348,7 +348,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
     assertThat(viewHolder.itemView.findViewById<Slider>(R.id.slider).value).isEqualTo(10)
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent(),
         QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
           addAnswer(
@@ -365,7 +365,7 @@ class QuestionnaireItemSliderViewHolderFactoryTest {
     assertThat(viewHolder.itemView.findViewById<Slider>(R.id.slider).value).isEqualTo(12)
 
     viewHolder.bind(
-      QuestionnaireItemViewItem(
+      QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply {
           addExtension().apply {
             url = "http://hl7.org/fhir/StructureDefinition/minValue"

From 409b45fecb378e5e9934fc278dad854b5f217851 Mon Sep 17 00:00:00 2001
From: santosh-pingle <86107848+santosh-pingle@users.noreply.github.com>
Date: Fri, 24 Feb 2023 15:12:55 +0530
Subject: [PATCH 6/6] Refactor the code for the DatePickerView (#1880)

* Refactor the code for the date picker view.

* clean up.

* clean up.

* refactor to resemble DateTimePicer

* Add tests

* parse propah

* clean up UiEspresso

* fix tests

* make function name more accurate

* address comments

* spotless apply duh

* forgot to change names to match new names

* add test case based on comment
'

---------

Co-authored-by: Santosh Pingle <spingle@google.com>
Co-authored-by: omarismail <omarismail@google.com>
---
 .../sampledata/component_date_picker.json     |  36 ++
 .../QuestionnaireUiEspressoTest.kt            | 257 ++++++++++++-
 .../datacapture/TestQuestionnaireFragment.kt  |  77 ----
 .../datacapture/TestQuestionnaireViewModel.kt |  67 ----
 ...DatePickerViewHolderFactoryEspressoTest.kt | 349 ------------------
 .../datacapture/extensions/MoreLocalDates.kt  |  12 +-
 .../factories/DatePickerViewHolderFactory.kt  | 179 ++++-----
 .../DateTimePickerViewHolderFactory.kt        |   8 +
 .../extensions/MoreLocalDatesTest.kt          |  12 +-
 .../DatePickerViewHolderFactoryTest.kt        |   2 +
 10 files changed, 389 insertions(+), 610 deletions(-)
 create mode 100644 datacapture/sampledata/component_date_picker.json
 delete mode 100644 datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireFragment.kt
 delete mode 100644 datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireViewModel.kt
 delete mode 100644 datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt

diff --git a/datacapture/sampledata/component_date_picker.json b/datacapture/sampledata/component_date_picker.json
new file mode 100644
index 0000000000..473bfc2fe3
--- /dev/null
+++ b/datacapture/sampledata/component_date_picker.json
@@ -0,0 +1,36 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Enter a date",
+      "type": "date",
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/entryFormat",
+          "valueString": "yyyy-mm-dd"
+        }
+      ],
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "1-most-recent",
+          "text": "Use keyboard entry or date picker",
+          "type": "display"
+        }
+      ]
+    }
+  ]
+}
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
index af65495c5b..ae47c039b9 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/QuestionnaireUiEspressoTest.kt
@@ -17,26 +17,40 @@
 package com.google.android.fhir.datacapture
 
 import android.widget.FrameLayout
-import androidx.core.os.bundleOf
-import androidx.fragment.app.add
 import androidx.fragment.app.commitNow
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.QUESTIONNAIRE_FILE_PATH_KEY
+import androidx.test.platform.app.InstrumentationRegistry
+import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
+import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.datacapture.test.R
 import com.google.android.fhir.datacapture.utilities.clickIcon
 import com.google.android.fhir.datacapture.utilities.clickOnText
+import com.google.android.fhir.datacapture.validation.Invalid
+import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator
+import com.google.android.fhir.datacapture.validation.Valid
+import com.google.android.fhir.datacapture.views.factories.localDate
 import com.google.android.fhir.datacapture.views.factories.localDateTime
 import com.google.android.material.textfield.TextInputLayout
 import com.google.common.truth.Truth.assertThat
+import java.time.LocalDate
 import java.time.LocalDateTime
+import java.util.Calendar
+import java.util.Date
+import org.hamcrest.CoreMatchers
+import org.hl7.fhir.r4.model.DateTimeType
+import org.hl7.fhir.r4.model.DateType
+import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -51,6 +65,8 @@ class QuestionnaireUiEspressoTest {
     ActivityScenarioRule(TestActivity::class.java)
 
   private lateinit var parent: FrameLayout
+  private val parser: IParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
+  private val context = InstrumentationRegistry.getInstrumentation().context
 
   @Before
   fun setup() {
@@ -59,7 +75,7 @@ class QuestionnaireUiEspressoTest {
 
   @Test
   fun shouldDisplayReviewButtonWhenNoMorePagesToDisplay() {
-    buildFragmentFromQuestionnaire("/paginated_questionnaire_with_dependent_answer.json")
+    buildFragmentFromQuestionnaire("/paginated_questionnaire_with_dependent_answer.json", true)
 
     onView(withId(R.id.review_mode_button))
       .check(
@@ -148,22 +164,243 @@ class QuestionnaireUiEspressoTest {
     assertThat(answer.localDateTime).isEqualTo(LocalDateTime.of(2005, 1, 5, 6, 10))
   }
 
-  private fun buildFragmentFromQuestionnaire(fileName: String) {
-    val bundle = bundleOf(QUESTIONNAIRE_FILE_PATH_KEY to fileName)
+  @Test
+  fun datePicker_shouldShowErrorForWrongDate() {
+    buildFragmentFromQuestionnaire("/component_date_picker.json")
+
+    // Add month and day. No need to add slashes as they are added automatically
+    onView(withId(R.id.text_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("0105"))
+
+    onView(withId(R.id.text_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
+    }
+  }
+
+  @Test
+  fun datePicker_shouldSaveInQuestionnaireResponseWhenCorrectDateEntered() {
+    buildFragmentFromQuestionnaire("/component_date_picker.json")
+
+    onView(withId(R.id.text_input_edit_text))
+      .perform(ViewActions.click())
+      .perform(ViewActions.typeTextIntoFocusedView("01052005"))
+
+    onView(withId(R.id.text_input_layout)).check { view, _ ->
+      val actualError = (view as TextInputLayout).error
+      assertThat(actualError).isEqualTo(null)
+    }
+
+    val answer = getQuestionnaireResponse().item.first().answer.first().valueDateType
+    assertThat(answer.localDate).isEqualTo(LocalDate.of(2005, 1, 5))
+  }
+
+  @Test
+  fun datePicker_shouldSetDateInput_withinRange() {
+    val questionnaire =
+      Questionnaire().apply {
+        id = "a-questionnaire"
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            type = Questionnaire.QuestionnaireItemType.DATE
+            linkId = "link-1"
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/minValue"
+              val minDate = DateType(Date()).apply { add(Calendar.YEAR, -1) }
+              setValue(minDate)
+            }
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/maxValue"
+              val maxDate = DateType(Date()).apply { add(Calendar.YEAR, 4) }
+              setValue(maxDate)
+            }
+          }
+        )
+      }
+
+    buildFragmentFromQuestionnaire(questionnaire)
+    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
+    onView(CoreMatchers.allOf(ViewMatchers.withText("OK")))
+      .inRoot(RootMatchers.isDialog())
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .perform(ViewActions.click())
+
+    val today = DateTimeType.today().valueAsString
+    val answer = getQuestionnaireResponse().item.first().answer.first().valueDateType.valueAsString
+
+    assertThat(answer).isEqualTo(today)
+    val validationResult =
+      QuestionnaireResponseValidator.validateQuestionnaireResponse(
+        questionnaire,
+        getQuestionnaireResponse(),
+        context
+      )
+
+    assertThat(validationResult["link-1"]?.first()).isEqualTo(Valid)
+  }
+
+  @Test
+  fun datePicker_shouldNotSetDateInput_outsideMaxRange() {
+    val maxDate = DateType(Date()).apply { add(Calendar.YEAR, -2) }
+    val questionnaire =
+      Questionnaire().apply {
+        id = "a-questionnaire"
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            type = Questionnaire.QuestionnaireItemType.DATE
+            linkId = "link-1"
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/minValue"
+              val minDate = DateType(Date()).apply { add(Calendar.YEAR, -4) }
+              setValue(minDate)
+            }
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/maxValue"
+              setValue(maxDate)
+            }
+          }
+        )
+      }
+
+    buildFragmentFromQuestionnaire(questionnaire)
+    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
+    onView(CoreMatchers.allOf(ViewMatchers.withText("OK")))
+      .inRoot(RootMatchers.isDialog())
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .perform(ViewActions.click())
+
+    val maxDateAllowed = maxDate.valueAsString
+    val validationResult =
+      QuestionnaireResponseValidator.validateQuestionnaireResponse(
+        questionnaire,
+        getQuestionnaireResponse(),
+        context
+      )
+
+    assertThat((validationResult["link-1"]?.first() as Invalid).getSingleStringValidationMessage())
+      .isEqualTo("Maximum value allowed is:$maxDateAllowed")
+  }
+
+  @Test
+  fun datePicker_shouldNotSetDateInput_outsideMinRange() {
+    val minDate = DateType(Date()).apply { add(Calendar.YEAR, 1) }
+    val questionnaire =
+      Questionnaire().apply {
+        id = "a-questionnaire"
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            type = Questionnaire.QuestionnaireItemType.DATE
+            linkId = "link-1"
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/minValue"
+              setValue(minDate)
+            }
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/maxValue"
+              val maxDate = DateType(Date()).apply { add(Calendar.YEAR, 2) }
+              setValue(maxDate)
+            }
+          }
+        )
+      }
+
+    buildFragmentFromQuestionnaire(questionnaire)
+    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
+    onView(CoreMatchers.allOf(ViewMatchers.withText("OK")))
+      .inRoot(RootMatchers.isDialog())
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .perform(ViewActions.click())
+
+    val minDateAllowed = minDate.valueAsString
+    val validationResult =
+      QuestionnaireResponseValidator.validateQuestionnaireResponse(
+        questionnaire,
+        getQuestionnaireResponse(),
+        context
+      )
+
+    assertThat((validationResult["link-1"]?.first() as Invalid).getSingleStringValidationMessage())
+      .isEqualTo("Minimum value allowed is:$minDateAllowed")
+  }
+
+  @Test
+  fun datePicker_shouldThrowException_whenMinValueRangeIsGreaterThanMaxValueRange() {
+    val questionnaire =
+      Questionnaire().apply {
+        id = "a-questionnaire"
+        addItem(
+          Questionnaire.QuestionnaireItemComponent().apply {
+            type = Questionnaire.QuestionnaireItemType.DATE
+            linkId = "link-1"
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/minValue"
+              val minDate = DateType(Date()).apply { add(Calendar.YEAR, 1) }
+
+              setValue(minDate)
+            }
+            addExtension().apply {
+              url = "http://hl7.org/fhir/StructureDefinition/maxValue"
+              val maxDate = DateType(Date()).apply { add(Calendar.YEAR, -1) }
+              setValue(maxDate)
+            }
+          }
+        )
+      }
+
+    buildFragmentFromQuestionnaire(questionnaire)
+    val exception =
+      Assert.assertThrows(IllegalArgumentException::class.java) {
+        onView(withId(com.google.android.fhir.datacapture.R.id.text_input_layout))
+          .perform(clickIcon(true))
+        onView(CoreMatchers.allOf(ViewMatchers.withText("OK")))
+          .inRoot(RootMatchers.isDialog())
+          .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+          .perform(ViewActions.click())
+      }
+    assertThat(exception.message).isEqualTo("minValue cannot be greater than maxValue")
+  }
+
+  private fun buildFragmentFromQuestionnaire(fileName: String, isReviewMode: Boolean = false) {
+    val questionnaireJsonString = readFileFromAssets(fileName)
+    val questionnaireFragment =
+      QuestionnaireFragment.builder()
+        .setQuestionnaire(questionnaireJsonString)
+        .showReviewPageBeforeSubmit(isReviewMode)
+        .build()
     activityScenarioRule.scenario.onActivity { activity ->
       activity.supportFragmentManager.commitNow {
         setReorderingAllowed(true)
-        add<TestQuestionnaireFragment>(R.id.container_holder, args = bundle)
+        add(R.id.container_holder, questionnaireFragment)
       }
     }
   }
+
+  private fun buildFragmentFromQuestionnaire(
+    questionnaire: Questionnaire,
+    isReviewMode: Boolean = false
+  ) {
+    val questionnaireFragment =
+      QuestionnaireFragment.builder()
+        .setQuestionnaire(parser.encodeResourceToString(questionnaire))
+        .showReviewPageBeforeSubmit(isReviewMode)
+        .build()
+    activityScenarioRule.scenario.onActivity { activity ->
+      activity.supportFragmentManager.commitNow {
+        setReorderingAllowed(true)
+        add(R.id.container_holder, questionnaireFragment)
+      }
+    }
+  }
+
+  private fun readFileFromAssets(filename: String) =
+    javaClass.getResourceAsStream(filename)!!.bufferedReader().use { it.readText() }
   private fun getQuestionnaireResponse(): QuestionnaireResponse {
     var testQuestionnaireFragment: QuestionnaireFragment? = null
     activityScenarioRule.scenario.onActivity { activity ->
       testQuestionnaireFragment =
-        activity.supportFragmentManager
-          .findFragmentById(R.id.container_holder)
-          ?.childFragmentManager?.findFragmentById(R.id.container) as QuestionnaireFragment
+        activity.supportFragmentManager.findFragmentById(R.id.container_holder)
+          as QuestionnaireFragment
     }
     return testQuestionnaireFragment!!.getQuestionnaireResponse()
   }
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireFragment.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireFragment.kt
deleted file mode 100644
index b1ea038362..0000000000
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireFragment.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.add
-import androidx.fragment.app.commitNow
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
-import com.google.android.fhir.datacapture.test.R
-import kotlinx.coroutines.launch
-
-class TestQuestionnaireFragment : Fragment() {
-
-  private val viewModel: TestQuestionnaireViewModel by viewModels()
-
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View {
-    return inflater.inflate(R.layout.test_fragment_layout, container, false)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    if (savedInstanceState == null) {
-      addQuestionnaireFragment()
-    }
-  }
-
-  private fun addQuestionnaireFragment() {
-    viewLifecycleOwner.lifecycleScope.launch {
-      if (childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
-        childFragmentManager.commitNow {
-          setReorderingAllowed(true)
-          add<QuestionnaireFragment>(
-            R.id.container,
-            tag = QUESTIONNAIRE_FRAGMENT_TAG,
-            args =
-              bundleOf(
-                QuestionnaireFragment.EXTRA_QUESTIONNAIRE_JSON_STRING to
-                  viewModel.getQuestionnaireJson(),
-                QuestionnaireFragment.EXTRA_ENABLE_REVIEW_PAGE to true
-              )
-          )
-        }
-      }
-    }
-  }
-
-  companion object {
-    const val QUESTIONNAIRE_FRAGMENT_TAG = "questionnaire-fragment-tag"
-    const val QUESTIONNAIRE_FILE_PATH_KEY = "questionnaire-file-path-key"
-    const val QUESTIONNAIRE_FILE_WITH_VALIDATION_PATH_KEY =
-      "questionnaire-file-with-validation-path-key"
-  }
-}
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireViewModel.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireViewModel.kt
deleted file mode 100644
index fb970db001..0000000000
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/TestQuestionnaireViewModel.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.viewModelScope
-import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.QUESTIONNAIRE_FILE_PATH_KEY
-import com.google.android.fhir.datacapture.TestQuestionnaireFragment.Companion.QUESTIONNAIRE_FILE_WITH_VALIDATION_PATH_KEY
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class TestQuestionnaireViewModel(application: Application, private val state: SavedStateHandle) :
-  AndroidViewModel(application) {
-  private val backgroundContext = viewModelScope.coroutineContext
-  private var questionnaireJson: String? = null
-  private var questionnaireWithValidationJson: String? = null
-
-  init {
-    viewModelScope.launch {
-      getQuestionnaireJson()
-      // TODO remove check once all files are added
-      if (!state.get<String>(QUESTIONNAIRE_FILE_WITH_VALIDATION_PATH_KEY).isNullOrEmpty()) {
-        getQuestionnaireWithValidationJson()
-      }
-    }
-  }
-
-  suspend fun getQuestionnaireJson(): String {
-    return withContext(backgroundContext) {
-      if (questionnaireJson == null) {
-        questionnaireJson = readFileFromAssets(state[QUESTIONNAIRE_FILE_PATH_KEY]!!)
-      }
-      questionnaireJson!!
-    }
-  }
-
-  private suspend fun getQuestionnaireWithValidationJson(): String {
-    return withContext(backgroundContext) {
-      if (questionnaireWithValidationJson == null) {
-        questionnaireWithValidationJson =
-          readFileFromAssets(state[QUESTIONNAIRE_FILE_WITH_VALIDATION_PATH_KEY]!!)
-      }
-      questionnaireWithValidationJson!!
-    }
-  }
-
-  private suspend fun readFileFromAssets(filename: String) =
-    withContext(backgroundContext) {
-      javaClass.getResourceAsStream(filename)!!.bufferedReader().use { it.readText() }
-    }
-}
diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt
deleted file mode 100644
index 814f24199e..0000000000
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/DatePickerViewHolderFactoryEspressoTest.kt
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.views
-
-import android.content.Context
-import android.view.View
-import android.widget.FrameLayout
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.RootMatchers.isDialog
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.google.android.fhir.datacapture.R
-import com.google.android.fhir.datacapture.TestActivity
-import com.google.android.fhir.datacapture.utilities.clickIcon
-import com.google.android.fhir.datacapture.validation.Invalid
-import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.validation.QuestionnaireResponseItemValidator
-import com.google.android.fhir.datacapture.validation.Valid
-import com.google.android.fhir.datacapture.views.factories.DatePickerViewHolderFactory
-import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
-import com.google.android.material.textfield.TextInputLayout
-import com.google.common.truth.Truth.assertThat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-import org.hamcrest.CoreMatchers.allOf
-import org.hl7.fhir.r4.model.DateTimeType
-import org.hl7.fhir.r4.model.DateType
-import org.hl7.fhir.r4.model.Questionnaire
-import org.hl7.fhir.r4.model.QuestionnaireResponse
-import org.junit.Assert.assertThrows
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DatePickerViewHolderFactoryEspressoTest {
-
-  @Rule
-  @JvmField
-  var activityScenarioRule: ActivityScenarioRule<TestActivity> =
-    ActivityScenarioRule(TestActivity::class.java)
-
-  private lateinit var parent: FrameLayout
-  private lateinit var viewHolder: QuestionnaireItemViewHolder
-  @Before
-  fun setup() {
-    Locale.setDefault(Locale.US)
-    activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = DatePickerViewHolderFactory.create(parent)
-    setTestLayout(viewHolder.itemView)
-  }
-
-  @Test
-  fun shouldSetDateInput() {
-    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent(),
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    val today = DateTimeType.today().valueAsString
-
-    assertThat(answerHolder!!.single().valueDateType?.valueAsString).isEqualTo(today)
-  }
-
-  @Test
-  fun shouldSetDateInput_withinRange() {
-    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply {
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/minValue"
-            val minDate = DateType(Date()).apply { add(Calendar.YEAR, -1) }
-            setValue(minDate)
-          }
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/maxValue"
-            val maxDate = DateType(Date()).apply { add(Calendar.YEAR, 4) }
-            setValue(maxDate)
-          }
-        },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    val today = DateTimeType.today().valueAsString
-    val validationResult =
-      QuestionnaireResponseItemValidator.validate(
-        questionnaireItemView.questionnaireItem,
-        questionnaireItemView.answers,
-        viewHolder.itemView.context
-      )
-
-    assertThat(answerHolder!!.single().valueDateType?.valueAsString).isEqualTo(today)
-    assertThat(validationResult).isEqualTo(Valid)
-  }
-
-  @Test
-  fun shouldSetDateInput_invalid_date_entry_invalid_month_day_year() {
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent(),
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(ViewActions.click())
-    onView(withId(R.id.text_input_edit_text)).perform(ViewActions.typeText("40/0/-9992"))
-
-    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
-      .isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
-  }
-
-  @Test
-  fun shouldSetDateInput_invalid_date_entry_invalid_day() {
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent(),
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(ViewActions.click())
-    onView(withId(R.id.text_input_edit_text)).perform(ViewActions.typeText("1/100/2"))
-
-    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
-      .isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
-  }
-
-  @Test
-  fun shouldSetDateInput_invalid_date_entry_invalid_month() {
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent(),
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(ViewActions.click())
-    onView(withId(R.id.text_input_edit_text)).perform(ViewActions.typeText("40/1/2"))
-
-    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
-      .isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
-  }
-
-  @Test
-  fun shouldSetDateInput_invalid_date_entry_invalid_year() {
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent(),
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(ViewActions.click())
-    onView(withId(R.id.text_input_edit_text)).perform(ViewActions.typeText("1/1/22222"))
-
-    assertThat(viewHolder.itemView.findViewById<TextInputLayout>(R.id.text_input_layout).error)
-      .isEqualTo("Date format needs to be MM/dd/yyyy (e.g. 01/31/2023)")
-  }
-  @Test
-  fun shouldNotSetDateInput_outsideMaxRange() {
-    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val maxDate = DateType(Date()).apply { add(Calendar.YEAR, -2) }
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply {
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/minValue"
-            val minDate = DateType(Date()).apply { add(Calendar.YEAR, -4) }
-            setValue(minDate)
-          }
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/maxValue"
-            setValue(maxDate)
-          }
-        },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    val maxDateAllowed = maxDate.valueAsString
-    val validationResult =
-      QuestionnaireResponseItemValidator.validate(
-        questionnaireItemView.questionnaireItem,
-        answerHolder!!,
-        viewHolder.itemView.context
-      )
-
-    assertThat((validationResult as Invalid).getSingleStringValidationMessage())
-      .isEqualTo("Maximum value allowed is:$maxDateAllowed")
-  }
-
-  @Test
-  fun shouldNotSetDateInput_outsideMinRange() {
-    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
-    val minDate = DateType(Date()).apply { add(Calendar.YEAR, 1) }
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply {
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/minValue"
-            setValue(minDate)
-          }
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/maxValue"
-            val maxDate = DateType(Date()).apply { add(Calendar.YEAR, 2) }
-            setValue(maxDate)
-          }
-        },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
-    onView(allOf(withText("OK")))
-      .inRoot(isDialog())
-      .check(matches(isDisplayed()))
-      .perform(ViewActions.click())
-
-    val minDateAllowed = minDate.valueAsString
-    val validationResult =
-      QuestionnaireResponseItemValidator.validate(
-        questionnaireItemView.questionnaireItem,
-        answerHolder!!,
-        viewHolder.itemView.context
-      )
-
-    assertThat((validationResult as Invalid).getSingleStringValidationMessage())
-      .isEqualTo("Minimum value allowed is:$minDateAllowed")
-  }
-
-  @Test
-  fun shouldThrowException_whenMinValueRangeIsGreaterThanMaxValueRange() {
-    val questionnaireItemView =
-      QuestionnaireViewItem(
-        Questionnaire.QuestionnaireItemComponent().apply {
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/minValue"
-            val minDate = DateType(Date()).apply { add(Calendar.YEAR, 1) }
-            setValue(minDate)
-          }
-          addExtension().apply {
-            url = "http://hl7.org/fhir/StructureDefinition/maxValue"
-            val maxDate = DateType(Date()).apply { add(Calendar.YEAR, -1) }
-            setValue(maxDate)
-          }
-        },
-        QuestionnaireResponse.QuestionnaireResponseItemComponent(),
-        validationResult = NotValidated,
-        answersChangedCallback = { _, _, _, _ -> },
-      )
-
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    val exception =
-      assertThrows(IllegalArgumentException::class.java) {
-        onView(withId(R.id.text_input_layout)).perform(clickIcon(true))
-        onView(allOf(withText("OK")))
-          .inRoot(isDialog())
-          .check(matches(isDisplayed()))
-          .perform(ViewActions.click())
-      }
-    assertThat(exception.message).isEqualTo("minValue cannot be greater than maxValue")
-  }
-
-  /** Runs code snippet on UI/main thread */
-  private fun runOnUI(action: () -> Unit) {
-    activityScenarioRule.scenario.onActivity { activity -> action() }
-  }
-
-  /** Sets content view for test activity */
-  private fun setTestLayout(view: View) {
-    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-  }
-
-  private fun setLocale(locale: Locale, context: Context) {
-    Locale.setDefault(locale)
-    context.resources.configuration.setLocale(locale)
-  }
-}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
index 1cc182abce..477c9fbe89 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
@@ -17,7 +17,6 @@
 package com.google.android.fhir.datacapture
 
 import android.icu.text.DateFormat
-import android.icu.text.SimpleDateFormat
 import com.google.android.fhir.datacapture.views.factories.length
 import com.google.android.fhir.datacapture.views.factories.localDate
 import java.lang.Character.isLetter
@@ -75,16 +74,17 @@ internal fun canonicalizeDatePattern(datePattern: String): String {
 
 /**
  * Parses a date string using the given date pattern, or the default date pattern for the device
- * locale.
+ * locale. If the parsing fails, an exception is thrown. These exceptions are caught in the calling
+ * widgets.
  */
 internal fun parseDate(text: String, datePattern: String): LocalDate {
-  val dateFormat =
+  val localDate =
     if (datePattern.isNotEmpty()) {
-      SimpleDateFormat(datePattern)
+      LocalDate.parse(text, DateTimeFormatter.ofPattern(datePattern))
     } else {
-      DateFormat.getDateInstance(DateFormat.SHORT)
+      DateFormat.getDateInstance(DateFormat.SHORT).apply { isLenient = false }.parse(text).localDate
     }
-  val localDate = dateFormat.apply { isLenient = false }.parse(text).localDate
+
   // Throw ParseException if year is less than 4 digits.
   if (localDate.year.length() < 4) {
     throw ParseException("Year has less than 4 digits.", text.indexOf('y'))
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
index 63164a84ec..9cd270a258 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactory.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.canonicalizeDatePattern
 import com.google.android.fhir.datacapture.format
@@ -49,6 +50,7 @@ import java.time.LocalDate
 import java.time.ZoneId
 import java.time.chrono.IsoChronology
 import java.time.format.DateTimeFormatterBuilder
+import java.time.format.DateTimeParseException
 import java.time.format.FormatStyle
 import java.util.Date
 import java.util.Locale
@@ -72,63 +74,70 @@ internal object DatePickerViewHolderFactory :
         header = itemView.findViewById(R.id.header)
         textInputLayout = itemView.findViewById(R.id.text_input_layout)
         textInputEditText = itemView.findViewById(R.id.text_input_edit_text)
+        textInputEditText.setOnFocusChangeListener { view, hasFocus ->
+          if (!hasFocus) {
+            (view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager)
+              .hideSoftInputFromWindow(view.windowToken, 0)
+          }
+        }
         textInputLayout.setEndIconOnClickListener {
           // The application is wrapped in a ContextThemeWrapper in QuestionnaireFragment
           // and again in TextInputEditText during layout inflation. As a result, it is
           // necessary to access the base context twice to retrieve the application object
           // from the view's context.
           val context = itemView.context.tryUnwrapContext()!!
-          createMaterialDatePicker()
+          val localDateInput =
+            questionnaireViewItem.answers.singleOrNull()?.valueDateType?.localDate
+          buildMaterialDatePicker(localDateInput)
             .apply {
               addOnPositiveButtonClickListener { epochMilli ->
-                val formattedDate =
-                  Instant.ofEpochMilli(epochMilli)
-                    .atZone(ZONE_ID_UTC)
-                    .toLocalDate()
-                    .format(canonicalizedDatePattern)
-                textInputEditText.setText(formattedDate)
-                questionnaireViewItem.setAnswer(
-                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-                    val localDate =
-                      Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()
-                    value = localDate.dateType
-                  }
-                )
+                with(Instant.ofEpochMilli(epochMilli).atZone(ZONE_ID_UTC).toLocalDate()) {
+                  textInputEditText.setText(this?.format(canonicalizedDatePattern))
+                  setQuestionnaireItemViewItemAnswer(this)
+                }
                 // Clear focus so that the user can refocus to open the dialog
                 textInputEditText.clearFocus()
               }
             }
             .show(context.supportFragmentManager, TAG)
         }
-      }
-
-      @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
-      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        header.bind(questionnaireViewItem.questionnaireItem)
         val localeDatePattern = getLocalizedDateTimePattern()
         // Special character used in date pattern
         val datePatternSeparator = getDateSeparator(localeDatePattern)
         textWatcher = DatePatternTextWatcher(datePatternSeparator)
         canonicalizedDatePattern = canonicalizeDatePattern(localeDatePattern)
+      }
+
+      @SuppressLint("NewApi") // java.time APIs can be used due to desugaring
+      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
+        clearPreviousState()
+        header.bind(questionnaireViewItem.questionnaireItem)
         textInputLayout.hint = canonicalizedDatePattern
         textInputEditText.removeTextChangedListener(textWatcher)
-        updateTextFieldToDisplayDateValue()
-        textInputEditText.addTextChangedListener(textWatcher)
-        displayValidationResult(questionnaireViewItem.validationResult)
-      }
 
-      private fun displayValidationResult(validationResult: ValidationResult) {
-        // Since the draft answer is still displayed in the text field, do not erase the error
-        // text if the answer is cleared and the validation result is valid.
-        if (questionnaireViewItem.answers.isEmpty() && validationResult == Valid) {
-          return
+        val questionnaireItemViewItemDateAnswer =
+          questionnaireViewItem.answers.singleOrNull()?.valueDateType?.localDate
+
+        val dateStringToDisplay =
+          questionnaireItemViewItemDateAnswer?.format(canonicalizedDatePattern)
+            ?: questionnaireViewItem.draftAnswer as? String
+
+        if (textInputEditText.text.toString() != dateStringToDisplay) {
+          textInputEditText.setText(dateStringToDisplay)
         }
-        textInputLayout.error =
-          when (validationResult) {
-            is NotValidated,
-            Valid -> null
-            is Invalid -> validationResult.getSingleStringValidationMessage()
-          }
+
+        // If the draft answer is set, this means the user has yet to type a parseable answer,
+        // so we display an error.
+        if (questionnaireViewItem.draftAnswer as? String != null) {
+          displayValidationResult(
+            Invalid(
+              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
+            )
+          )
+        } else {
+          displayValidationResult(questionnaireViewItem.validationResult)
+        }
+        textInputEditText.addTextChangedListener(textWatcher)
       }
 
       override fun setReadOnly(isReadOnly: Boolean) {
@@ -136,19 +145,14 @@ internal object DatePickerViewHolderFactory :
         textInputLayout.isEnabled = !isReadOnly
       }
 
-      private fun createMaterialDatePicker(): MaterialDatePicker<Long> {
-        val selectedDate =
-          questionnaireViewItem.answers
-            .singleOrNull()
-            ?.valueDateType
-            ?.localDate
-            ?.atStartOfDay(ZONE_ID_UTC)
-            ?.toInstant()
-            ?.toEpochMilli()
+      private fun buildMaterialDatePicker(localDate: LocalDate?): MaterialDatePicker<Long> {
+        val selectedDateMillis =
+          localDate?.atStartOfDay(ZONE_ID_UTC)?.toInstant()?.toEpochMilli()
             ?: MaterialDatePicker.todayInUtcMilliseconds()
+
         return MaterialDatePicker.Builder.datePicker()
           .setTitleText(R.string.select_date)
-          .setSelection(selectedDate)
+          .setSelection(selectedDateMillis)
           .setCalendarConstraints(getCalenderConstraint())
           .build()
       }
@@ -169,63 +173,42 @@ internal object DatePickerViewHolderFactory :
         return CalendarConstraints.Builder().setValidator(validators).build()
       }
 
-      private fun updateAnswer(text: String?) {
-        if (text.isNullOrEmpty()) {
-          questionnaireViewItem.clearAnswer()
-          return
-        }
-        try {
-          val localDate = parseDate(text, canonicalizedDatePattern)
-          questionnaireViewItem.setAnswer(
-            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-              value = localDate.dateType
-            }
-          )
-        } catch (e: ParseException) {
-          displayValidationResult(
-            Invalid(
-              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
-            )
-          )
-          if (questionnaireViewItem.answers.isNotEmpty()) {
-            questionnaireViewItem.clearAnswer()
-          }
-          questionnaireViewItem.setDraftAnswer(text.toString())
-        }
+      private fun clearPreviousState() {
+        textInputEditText.isEnabled = true
+        textInputLayout.isEnabled = true
       }
 
-      private fun updateTextFieldToDisplayDateValue() {
-        val draftAnswerToDisplay = questionnaireViewItem.draftAnswer as? String
-        val answer =
-          questionnaireViewItem.answers
-            .singleOrNull()
-            ?.takeIf { it.hasValue() }
-            ?.valueDateType
-            ?.localDate
-        val textToDisplayInTheTextField =
-          answer?.format(canonicalizedDatePattern) ?: draftAnswerToDisplay
-
-        // The same date format style is now used for both
-        // accepting user date input and displaying the answer in the text field. For instance, the
-        // "MM/dd/yyyy" format is employed to accept and display the date value. As a result, it is
-        // possible to simply compare
-        // the text field text to the draft or valid answer to determine whether the text field
-        // text should be overridden or not.
-
-        if (textInputEditText.text.toString() != textToDisplayInTheTextField) {
-          textInputEditText.setText(textToDisplayInTheTextField)
-        }
+      /** Set the answer in the [QuestionnaireResponse]. */
+      private fun setQuestionnaireItemViewItemAnswer(localDate: LocalDate) =
+        questionnaireViewItem.setAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+            value = localDate.dateType
+          }
+        )
 
-        // Show an error text if draft answer exists
-        if (!draftAnswerToDisplay.isNullOrBlank()) {
-          displayValidationResult(
-            Invalid(
-              listOf(invalidDateErrorText(textInputEditText.context, canonicalizedDatePattern))
-            )
-          )
-        } else {
-          displayValidationResult(NotValidated)
+      /**
+       * Each time the user types in a character, parse the string and if it can be parsed into a
+       * date, set the answer in the [QuestionnaireResponse], otherwise, set the draft answer.
+       */
+      private fun parseDateOnTextChanged(dateToDisplay: String?) =
+        try {
+          dateToDisplay?.let {
+            val localDate = parseDate(it, canonicalizedDatePattern)
+            setQuestionnaireItemViewItemAnswer(localDate)
+          }
+        } catch (e: ParseException) {
+          questionnaireViewItem.setDraftAnswer(dateToDisplay)
+        } catch (e: DateTimeParseException) {
+          questionnaireViewItem.setDraftAnswer(dateToDisplay)
         }
+
+      private fun displayValidationResult(validationResult: ValidationResult) {
+        textInputLayout.error =
+          when (validationResult) {
+            is NotValidated,
+            Valid -> null
+            is Invalid -> validationResult.getSingleStringValidationMessage()
+          }
       }
 
       /** Automatically appends date separator (e.g. "/") during date input. */
@@ -255,7 +238,7 @@ internal object DatePickerViewHolderFactory :
             dateFormatSeparator,
             isDeleting
           )
-          updateAnswer(editable.toString())
+          parseDateOnTextChanged(editable.toString())
         }
       }
     }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
index bdec83493e..5839b26e99 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/DateTimePickerViewHolderFactory.kt
@@ -49,6 +49,7 @@ import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
+import java.time.format.DateTimeParseException
 import java.util.Date
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
@@ -260,6 +261,13 @@ internal object DateTimePickerViewHolderFactory :
               listOf(invalidDateErrorText(dateInputEditText.context, canonicalizedDatePattern))
             )
           )
+        } catch (e: DateTimeParseException) {
+          timeInputLayout.isEnabled = false
+          displayDateValidationError(
+            Invalid(
+              listOf(invalidDateErrorText(dateInputEditText.context, canonicalizedDatePattern))
+            )
+          )
         }
 
       /** Automatically appends date separator (e.g. "/") during date input. */
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
index 59e2e12464..1564ac54b6 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreLocalDatesTest.kt
@@ -23,8 +23,8 @@ import com.google.android.fhir.datacapture.getDateSeparator
 import com.google.android.fhir.datacapture.parseDate
 import com.google.android.fhir.datacapture.views.factories.getLocalizedDateTimePattern
 import com.google.common.truth.Truth.assertThat
-import java.text.ParseException
 import java.time.LocalDate
+import java.time.format.DateTimeParseException
 import java.util.Locale
 import kotlin.test.assertFailsWith
 import org.junit.Test
@@ -112,9 +112,15 @@ class MoreLocalDatesTest {
   }
 
   @Test
-  fun `should parse US locale date for Canada locale`() {
+  fun `should not parse US date for Canada locale`() {
     Locale.setDefault(Locale.CANADA)
-    assertFailsWith<ParseException> { parseDate("01/25/2023", "yyyy-MM-dd") }
+    assertFailsWith<DateTimeParseException> { parseDate("01/25/2023", "yyyy-MM-dd") }
+  }
+
+  @Test
+  fun `should not parse date when the input is valid but not the same as the date pattern`() {
+    assertFailsWith<DateTimeParseException> { parseDate("1/25/2023", "MM/dd/yyyy") }
+    assertFailsWith<DateTimeParseException> { parseDate("11/1/2023", "MM/dd/yyyy") }
   }
 
   @Test
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
index 6d421ade67..ca2c87c64a 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/views/factories/DatePickerViewHolderFactoryTest.kt
@@ -111,6 +111,7 @@ class DatePickerViewHolderFactoryTest {
   @Test
   fun shouldSetDateInput_localeJp() {
     setLocale(Locale.JAPAN)
+    val viewHolder = DatePickerViewHolderFactory.create(parent)
     viewHolder.bind(
       QuestionnaireViewItem(
         Questionnaire.QuestionnaireItemComponent().apply { text = "Question?" },
@@ -169,6 +170,7 @@ class DatePickerViewHolderFactoryTest {
   @Test
   fun `parse date text input in Japan locale`() {
     setLocale(Locale.JAPAN)
+    val viewHolder = DatePickerViewHolderFactory.create(parent)
     var answers: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
     val item =
       QuestionnaireViewItem(