diff --git a/app/BUILD.bazel b/app/BUILD.bazel
index b26ca48f613..8d5ad2a174e 100644
--- a/app/BUILD.bazel
+++ b/app/BUILD.bazel
@@ -540,7 +540,6 @@ kt_android_library(
         "//third_party:androidx_core_core",
         "//third_party:androidx_databinding_databinding-common",
         "//third_party:androidx_databinding_databinding-runtime",
-        "//utility",
         "//utility/src/main/java/org/oppia/android/util/extensions:context_extensions",
         "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
         "//utility/src/main/java/org/oppia/android/util/math:fraction_parser",
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityTest.kt
index 3f494ad8452..ca64dadbb80 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.administratorcontrols
+package org.oppia.android.app.administratorcontrols.appversion
 
 import android.app.Application
 import android.content.Context
@@ -30,8 +30,8 @@ import org.junit.runner.RunWith
 import org.oppia.android.app.activity.ActivityComponent
 import org.oppia.android.app.activity.ActivityComponentFactory
 import org.oppia.android.app.activity.route.ActivityRouterModule
+import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity
 import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity.Companion.createAdministratorControlsActivityIntent
-import org.oppia.android.app.administratorcontrols.appversion.AppVersionActivity
 import org.oppia.android.app.application.ApplicationComponent
 import org.oppia.android.app.application.ApplicationInjector
 import org.oppia.android.app.application.ApplicationInjectorProvider
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityTest.kt
index b8ed41f7cf9..10f28e26d81 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.markchapterscompleted
 
 import android.app.Application
 import android.content.Context
@@ -35,7 +35,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentTest.kt
index f663565d979..8a6c5e77760 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.markchapterscompleted
 
 import android.app.Application
 import android.content.Context
@@ -39,7 +39,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedFragment
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.devoptions.markchapterscompleted.testing.MarkChaptersCompletedTestActivity
 import org.oppia.android.app.model.ChapterPlayState
 import org.oppia.android.app.model.MarkChaptersCompletedFragmentArguments
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivityTest.kt
index 10b555d0f2b..50c6d19f1b2 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.markstoriescompleted
 
 import android.app.Application
 import android.content.Context
@@ -27,7 +27,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.markstoriescompleted.MarkStoriesCompletedActivity
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentTest.kt
index 4eeb8204a99..64f76c796aa 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkStoriesCompletedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.markstoriescompleted
 
 import android.app.Application
 import android.content.Context
@@ -35,7 +35,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.markstoriescompleted.MarkStoriesCompletedFragment
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.devoptions.markstoriescompleted.testing.MarkStoriesCompletedTestActivity
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivityTest.kt
index e09b8ba24a4..1d3a2662828 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.marktopicscompleted
 
 import android.app.Application
 import android.content.Context
@@ -27,7 +27,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.marktopicscompleted.MarkTopicsCompletedActivity
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentTest.kt
index ad3e92067ee..79bf9d52d45 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkTopicsCompletedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/marktopicscompleted/MarkTopicsCompletedFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.marktopicscompleted
 
 import android.app.Application
 import android.content.Context
@@ -35,7 +35,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.marktopicscompleted.MarkTopicsCompletedFragment
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.devoptions.marktopicscompleted.testing.MarkTopicsCompletedTestActivity
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsActivityTest.kt
index cbcabac550d..ffb90f7ca6f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.vieweventlogs
 
 import android.app.Application
 import android.content.Context
@@ -28,7 +28,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
-import org.oppia.android.app.devoptions.vieweventlogs.ViewEventLogsActivity
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsFragmentTest.kt
index 0801304740c..1ca95d88048 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/vieweventlogs/ViewEventLogsFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.devoptions
+package org.oppia.android.app.devoptions.vieweventlogs
 
 import android.app.Application
 import android.content.Context
@@ -34,6 +34,8 @@ import org.oppia.android.app.application.ApplicationInjectorProvider
 import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.devoptions.vieweventlogs.testing.ViewEventLogsTestActivity
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.ProfileId
diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListActivityTest.kt
similarity index 96%
rename from app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListActivityTest.kt
index b39d70be20d..68db71cbf88 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/faq/FaqListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.faq
+package org.oppia.android.app.help.faq
 
 import android.app.Application
 import android.content.Context
@@ -23,7 +23,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.faq.FAQListActivity
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
@@ -90,8 +89,8 @@ import javax.inject.Singleton
 /** Tests for [FAQListActivity]. */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-@Config(application = FaqListActivityTest.TestApplication::class, qualifiers = "port-xxhdpi")
-class FaqListActivityTest {
+@Config(application = FAQListActivityTest.TestApplication::class, qualifiers = "port-xxhdpi")
+class FAQListActivityTest {
   @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
   @get:Rule val oppiaTestRule = OppiaTestRule()
 
@@ -174,17 +173,17 @@ class FaqListActivityTest {
       override fun build(): TestApplicationComponent
     }
 
-    fun inject(faqListActivityTest: FaqListActivityTest)
+    fun inject(faqListActivityTest: FAQListActivityTest)
   }
 
   class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
     private val component: TestApplicationComponent by lazy {
-      DaggerFaqListActivityTest_TestApplicationComponent.builder()
+      DaggerFAQListActivityTest_TestApplicationComponent.builder()
         .setApplication(this)
         .build() as TestApplicationComponent
     }
 
-    fun inject(faqListActivityTest: FaqListActivityTest) {
+    fun inject(faqListActivityTest: FAQListActivityTest) {
       component.inject(faqListActivityTest)
     }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListFragmentTest.kt
index a7d853018a8..ef55735280e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/faq/FAQListFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.faq
+package org.oppia.android.app.help.faq
 
 import android.app.Application
 import android.content.Context
@@ -36,7 +36,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.faq.FAQListActivity
 import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity
 import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity.Companion.FAQ_SINGLE_ACTIVITY_PARAMS_KEY
 import org.oppia.android.app.model.FAQSingleActivityParams
diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityTest.kt
index 9d57984b91f..f57fb7b2c6e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.faq
+package org.oppia.android.app.help.faq.faqsingle
 
 import android.app.Application
 import android.content.Context
@@ -33,7 +33,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListActivityTest.kt
index 994f4e9bfd3..4644d1fb8ca 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import android.content.Context
@@ -23,7 +23,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.LicenseListActivity
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListFragmentTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListFragmentTest.kt
index 3024b528a65..8f1f94447e1 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseListFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import android.content.Intent
@@ -38,9 +38,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.LicenseListActivity
-import org.oppia.android.app.help.thirdparty.LicenseListFragment
-import org.oppia.android.app.help.thirdparty.LicenseTextViewerActivity
 import org.oppia.android.app.model.LicenseListFragmentArguments
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityTest.kt
index bb92ca55984..ab21e5fea14 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import android.content.Context
@@ -30,8 +30,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.LicenseListActivity
-import org.oppia.android.app.help.thirdparty.LicenseTextViewerActivity
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerFragmentTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerFragmentTest.kt
index 11cc27366ed..52c834a3daf 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/LicenseTextViewerFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import android.content.Intent
@@ -30,8 +30,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.LicenseTextViewerActivity
-import org.oppia.android.app.help.thirdparty.LicenseTextViewerFragment
 import org.oppia.android.app.model.LicenseTextViewerFragmentArguments
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListActivityTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListActivityTest.kt
index 9ea6484cb17..47ce34003b4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import android.content.Context
@@ -23,7 +23,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListActivity
 import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListActivity.Companion.createThirdPartyDependencyListActivityIntent
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListFragmentTest.kt
similarity index 98%
rename from app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListFragmentTest.kt
index 13d30d717a9..2ed3947c8a6 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.thirdparty
+package org.oppia.android.app.help.thirdparty
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatActivity
@@ -37,9 +37,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.help.thirdparty.LicenseListActivity
-import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListActivity
-import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListFragment
 import org.oppia.android.app.model.ThirdPartyDependencyListFragmentArguments
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityTest.kt
index 87eaefcd15c..1288281abdd 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.home
+package org.oppia.android.app.home.recentlyplayed
 
 import android.app.Application
 import android.content.Context
@@ -40,7 +40,6 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.ProfileId
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentTest.kt
index 8d155bed3fd..abf65e4229a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.home
+package org.oppia.android.app.home.recentlyplayed
 
 import android.app.Application
 import android.content.Context
@@ -47,7 +47,7 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedFragment
+import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
 import org.oppia.android.app.model.ExplorationCheckpoint
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModelTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModelTest.kt
index c97c82d7242..9e67cfcb44f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/TopicSummaryViewModelTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModelTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.home
+package org.oppia.android.app.home.topiclist
 
 import android.app.Application
 import android.content.Context
@@ -23,7 +23,7 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.home.topiclist.TopicSummaryViewModel
+import org.oppia.android.app.home.HomeFragment
 import org.oppia.android.app.model.EphemeralTopicSummary
 import org.oppia.android.app.model.SubtitledHtml
 import org.oppia.android.app.model.TopicSummary
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
index ba072fd41c7..ca1d746382e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
@@ -55,3 +55,29 @@ oppia_android_test(
         "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module",
     ],
 )
+
+oppia_android_test(
+    name = "ImageRegionSelectionInteractionViewTest",
+    srcs = [
+        "ImageRegionSelectionInteractionViewTest.kt",
+    ],
+    custom_package = "org.oppia.android.app.test",
+    test_class = "org.oppia.android.app.player.state.ImageRegionSelectionInteractionViewTest",
+    test_manifest = "//app:test_manifest",
+    deps = [
+        "//app:test_deps",
+        "//app/src/main/java/org/oppia/android/app/application:application_component",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector_provider",
+        "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
+        "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
+        "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+        "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionViewTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionViewTest.kt
index d3a890510a8..2485ebf04d4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionViewTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.testing
+package org.oppia.android.app.player.state
 
 import android.app.Application
 import android.content.Context
@@ -44,10 +44,10 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
-import org.oppia.android.app.player.state.StateFragment
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.test.R
+import org.oppia.android.app.testing.ImageRegionSelectionTestActivity
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.DefaultRegionClickedEvent
 import org.oppia.android.app.utility.NamedRegionClickedEvent
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentTest.kt
index 705fcfd9057..30e5b9d16da 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.walkthrough
+package org.oppia.android.app.walkthrough.end
 
 import android.app.Application
 import android.content.Context
@@ -46,7 +46,8 @@ import org.oppia.android.app.test.R
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
 import org.oppia.android.app.utility.ProgressMatcher.Companion.withProgress
-import org.oppia.android.app.walkthrough.end.WalkthroughFinalFragment
+import org.oppia.android.app.walkthrough.WalkthroughActivity
+import org.oppia.android.app.walkthrough.WalkthroughPages
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
 import org.oppia.android.data.backends.gae.NetworkModule
 import org.oppia.android.domain.classify.InteractionsModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentTest.kt
index f1518f6a68c..93d87f7b9f5 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.walkthrough
+package org.oppia.android.app.walkthrough.topiclist
 
 import android.app.Application
 import android.content.Context
@@ -45,6 +45,7 @@ import org.oppia.android.app.test.R
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
+import org.oppia.android.app.walkthrough.WalkthroughActivity
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
 import org.oppia.android.data.backends.gae.NetworkModule
 import org.oppia.android.domain.classify.InteractionsModule
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentTest.kt
similarity index 99%
rename from app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentTest.kt
index edaee206ff3..812527fb995 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.walkthrough
+package org.oppia.android.app.walkthrough.welcome
 
 import android.app.Application
 import android.content.Context
@@ -39,6 +39,7 @@ import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.test.R
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
+import org.oppia.android.app.walkthrough.WalkthroughActivity
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
 import org.oppia.android.data.backends.gae.NetworkModule
 import org.oppia.android.domain.classify.InteractionsModule
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 73c0a41f360..4f31f567cac 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -272,36 +272,6 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
-    name = "SurveyEventsLoggerTest",
-    srcs = ["SurveyEventsLoggerTest.kt"],
-    custom_package = "org.oppia.android.domain.oppialogger.analytics",
-    test_class = "org.oppia.android.domain.oppialogger.analytics.SurveyEventsLoggerTest",
-    test_manifest = "//domain:test_manifest",
-    deps = [
-        "//:dagger",
-        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
-        "//domain/src/main/java/org/oppia/android/domain/oppialogger/survey:survey_events_logger",
-        "//testing",
-        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
-        "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
-        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
-        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
-        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
-        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
-        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
-        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
-        "//third_party:androidx_test_ext_junit",
-        "//third_party:com_google_truth_truth",
-        "//third_party:junit_junit",
-        "//third_party:org_robolectric_robolectric",
-        "//third_party:robolectric_android-all",
-        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
-        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
-        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
-    ],
-)
-
 oppia_android_test(
     name = "FeatureFlagsLoggerTest",
     srcs = ["FeatureFlagsLoggerTest.kt"],
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel
new file mode 100644
index 00000000000..7a733e16ad0
--- /dev/null
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel
@@ -0,0 +1,35 @@
+"""
+Tests for app survey logging support.
+"""
+
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "SurveyEventsLoggerTest",
+    srcs = ["SurveyEventsLoggerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.SurveyEventsLoggerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        "//:dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/survey:survey_events_logger",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/SurveyEventsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/survey/SurveyEventsLoggerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/SurveyEventsLoggerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/survey/SurveyEventsLoggerTest.kt
diff --git a/scripts/assets/file_content_validation_checks.textproto b/scripts/assets/file_content_validation_checks.textproto
index 623850a21da..48f22c34703 100644
--- a/scripts/assets/file_content_validation_checks.textproto
+++ b/scripts/assets/file_content_validation_checks.textproto
@@ -21,6 +21,7 @@ file_content_checks {
   exempted_file_name: "utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityService.kt"
   exempted_file_name: "utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityServiceImpl.kt"
   exempted_file_name: "utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityService.kt"
+  exempted_file_name: "utility/src/test/java/org/oppia/android/util/accessibility/FakeAccessibilityServiceTest.kt"
 }
 file_content_checks {
   file_path_regex: ".+?\\.kt"
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index 62fd266cb49..a225ab4875f 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -788,7 +788,7 @@ test_file_exemption {
 }
 test_file_exemption {
   exempted_file_path: "app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt"
-  test_file_not_required: true
+  source_file_is_incompatible_with_code_coverage: true
 }
 test_file_exemption {
   exempted_file_path: "app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt"
@@ -1062,6 +1062,10 @@ test_file_exemption {
   exempted_file_path: "app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt"
   test_file_not_required: true
 }
+test_file_exemption {
+  exempted_file_path: "app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt"
+  source_file_is_incompatible_with_code_coverage: true
+}
 test_file_exemption {
   exempted_file_path: "app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt"
   test_file_not_required: true
@@ -3690,10 +3694,6 @@ test_file_exemption {
   exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt"
   test_file_not_required: true
 }
-test_file_exemption {
-  exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/survey/SurveyEventsLogger.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
 test_file_exemption {
   exempted_file_path: "domain/src/main/java/org/oppia/android/domain/platformparameter/PlatformParameterAlphaModule.kt"
   test_file_not_required: true
@@ -3862,18 +3862,6 @@ test_file_exemption {
   exempted_file_path: "domain/src/test/java/org/oppia/android/domain/classify/InteractionObjectTestBuilder.kt"
   test_file_not_required: true
 }
-test_file_exemption {
-  exempted_file_path: "instrumentation/src/java/org/oppia/android/instrumentation/application/EndToEndTestGcsResourceModule.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
-test_file_exemption {
-  exempted_file_path: "instrumentation/src/java/org/oppia/android/instrumentation/application/EndToEndTestImageParsingModule.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
-test_file_exemption {
-  exempted_file_path: "instrumentation/src/java/org/oppia/android/instrumentation/application/EndToEndTestNetworkConfigModule.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
 test_file_exemption {
   exempted_file_path: "instrumentation/src/java/org/oppia/android/instrumentation/application/TestApplicationComponent.kt"
   test_file_not_required: true
@@ -4242,10 +4230,6 @@ test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityTestModule.kt"
   test_file_not_required: true
 }
-test_file_exemption {
-  exempted_file_path: "utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityService.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
 test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt"
   test_file_not_required: true
@@ -4306,10 +4290,6 @@ test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/enumfilter/EnumFilterUtil.kt"
   test_file_not_required: true
 }
-test_file_exemption {
-  exempted_file_path: "utility/src/main/java/org/oppia/android/util/extensions/StringExtensions.kt"
-  source_file_is_incompatible_with_code_coverage: true
-}
 test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceAnnotations.kt"
   test_file_not_required: true
diff --git a/scripts/buildifier_lint_check.sh b/scripts/buildifier_lint_check.sh
old mode 100644
new mode 100755
diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
index 513a7e2329a..793f0c93682 100644
--- a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
+++ b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
@@ -309,7 +309,7 @@ private fun findTestFiles(
   val repoRootFile = File(repoRoot).absoluteFile
 
   val possibleTestFilePaths = when {
-    filePath.startsWith("scripts/") -> {
+    filePath.startsWith("scripts/") || filePath.startsWith("instrumentation/") -> {
       listOf(filePath.replace("/java/", "/javatests/").replace(".kt", "Test.kt"))
     }
     filePath.startsWith("app/") -> {
@@ -328,16 +328,18 @@ private fun findTestFiles(
     .map { File(repoRootFile, it) }
     .filter(File::exists)
     .map { it.toRelativeString(rootDirectory) }
+    .takeIf { it.isNotEmpty() }
+    ?: error("No appropriate test file found for the source file - $filePath")
 }
 
 private fun findSourceFile(
   rootDirectory: File,
   repoRoot: String,
   filePath: String
-): String? {
+): String {
   val repoRootFile = File(repoRoot).absoluteFile
   val possibleSourceFilePaths = when {
-    filePath.startsWith("scripts/") -> {
+    filePath.startsWith("scripts/") || filePath.startsWith("instrumentation/") -> {
       listOf(filePath.replace("/javatests/", "/java/").replace("Test.kt", ".kt"))
     }
     filePath.startsWith("app/") -> {
@@ -359,12 +361,10 @@ private fun findSourceFile(
     }
   }
 
-  return possibleSourceFilePaths
-    .mapNotNull { path ->
-      val file = File(repoRootFile, path)
-      file.takeIf { it.exists() }?.toRelativeString(rootDirectory)
-    }
-    .firstOrNull()
+  return possibleSourceFilePaths.firstNotNullOfOrNull { path ->
+    val file = File(repoRootFile, path)
+    file.takeIf { it.exists() }?.toRelativeString(rootDirectory)
+  } ?: error("No appropriate source file exists for the test file - $filePath")
 }
 
 private fun loadTestFileExemptionsProto(testFileExemptionProtoPath: String): TestFileExemptions {
diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt b/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
index 3d28a816c7d..284f02f4801 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
@@ -61,7 +61,7 @@ class RunCoverageTest {
   }
 
   @Test
-  fun testRunCoverage_missingTestFileNotExempted_generatesFailureReport() {
+  fun testRunCoverage_missingTestFileNotExempted_throwsException() {
     val sampleFile = "file.kt"
     testBazelWorkspace.initEmptyWorkspace()
     tempFolder.newFile(sampleFile)
@@ -74,26 +74,7 @@ class RunCoverageTest {
     }
 
     assertThat(exception).hasMessageThat()
-      .contains("Coverage Analysis$BOLD$RED FAILED$RESET")
-
-    val failureMessage =
-      "No appropriate test file found for $sampleFile."
-
-    val expectedMarkdown = buildString {
-      append("## Coverage Report\n\n")
-      append("### Results\n")
-      append("Number of files assessed: 1\n")
-      append("Overall Coverage: **0.00%**\n")
-      append("Coverage Analysis: **FAIL** :x:\n")
-      append("##\n\n")
-      append("### Failure Cases\n\n")
-      append("| File | Failure Reason | Status |\n")
-      append("|------|----------------|--------|\n")
-      append("| ${getFilenameAsDetailsSummary(sampleFile)} | $failureMessage | :x: |")
-      append(oppiaCoverageWikiPageLinkNote)
-    }
-
-    assertThat(readFinalMdReport()).isEqualTo(expectedMarkdown)
+      .contains("No appropriate test file found for the source file - $sampleFile")
   }
 
   @Test
@@ -1382,11 +1363,8 @@ class RunCoverageTest {
       "coverage/main/java/com/example/AddNums.kt",
       "coverage/main/java/com/example/LowTestNums.kt",
       exemptedFile,
-      "file.kt"
     )
 
-    tempFolder.newFile("file.kt")
-
     val testFileExemption = TestFileExemptions.TestFileExemption.newBuilder().apply {
       this.exemptedFilePath = exemptedFile
       this.testFileNotRequired = true
@@ -1429,20 +1407,13 @@ class RunCoverageTest {
     assertThat(exception).hasMessageThat()
       .contains("Coverage Analysis$BOLD$RED FAILED$RESET")
 
-    val failureMessage =
-      "No appropriate test file found for file.kt."
-
     val expectedResult = buildString {
       append("## Coverage Report\n\n")
       append("### Results\n")
-      append("Number of files assessed: 4\n")
+      append("Number of files assessed: 3\n")
       append("Overall Coverage: **37.50%**\n")
       append("Coverage Analysis: **FAIL** :x:\n")
       append("##\n\n")
-      append("### Failure Cases\n\n")
-      append("| File | Failure Reason | Status |\n")
-      append("|------|----------------|--------|\n")
-      append("| ${getFilenameAsDetailsSummary("file.kt")} | $failureMessage | :x: |\n\n")
       append("### Failing coverage\n\n")
       append("| File | Coverage | Lines Hit | Status | Min Required |\n")
       append("|------|:--------:|----------:|:------:|:------------:|\n")
@@ -2332,9 +2303,11 @@ class RunCoverageTest {
   @Test
   fun testRunCoverage_withProtoReportFormat_savesCoverageReportProto() {
     val sampleFile = "file.kt"
+    val sampleTestFile = "fileTest.kt"
     val outputFilePath = "${tempFolder.root}/coverage_reports/file/coverage_report.pb"
     testBazelWorkspace.initEmptyWorkspace()
     tempFolder.newFile(sampleFile)
+    tempFolder.newFile(sampleTestFile)
     main(
       tempFolder.root.absolutePath,
       sampleFile,
diff --git a/utility/src/test/java/org/oppia/android/util/accessibility/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/accessibility/BUILD.bazel
new file mode 100644
index 00000000000..fe9419df910
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/accessibility/BUILD.bazel
@@ -0,0 +1,21 @@
+"""
+Tests for accessibility utilities.
+"""
+
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "FakeAccessibilityServiceTest",
+    srcs = ["FakeAccessibilityServiceTest.kt"],
+    custom_package = "org.oppia.android.util.accessibility",
+    test_class = "org.oppia.android.util.accessibility.FakeAccessibilityServiceTest",
+    test_manifest = "//utility:test_manifest",
+    deps = [
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+    ],
+)
diff --git a/app/src/test/java/org/oppia/android/app/accessibility/FakeAccessibilityServiceTest.kt b/utility/src/test/java/org/oppia/android/util/accessibility/FakeAccessibilityServiceTest.kt
similarity index 94%
rename from app/src/test/java/org/oppia/android/app/accessibility/FakeAccessibilityServiceTest.kt
rename to utility/src/test/java/org/oppia/android/util/accessibility/FakeAccessibilityServiceTest.kt
index e77ded760d9..b821aa664fc 100644
--- a/app/src/test/java/org/oppia/android/app/accessibility/FakeAccessibilityServiceTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/accessibility/FakeAccessibilityServiceTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.app.accessibility
+package org.oppia.android.util.accessibility
 
 import android.app.Application
 import android.view.View
@@ -11,8 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.mock
-import org.oppia.android.util.accessibility.AccessibilityTestModule
-import org.oppia.android.util.accessibility.FakeAccessibilityService
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
diff --git a/utility/src/test/java/org/oppia/android/util/extensions/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/extensions/BUILD.bazel
new file mode 100644
index 00000000000..7193334be52
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/extensions/BUILD.bazel
@@ -0,0 +1,31 @@
+"""
+Tests for lightweight exploration player domain components.
+"""
+
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "BundleExtensionsTest",
+    srcs = ["BundleExtensionsTest.kt"],
+    custom_package = "org.oppia.android.util.extensions",
+    test_class = "org.oppia.android.util.extensions.BundleExtensionsTest",
+    test_manifest = "//utility:test_manifest",
+    deps = [
+        "//model/src/main/proto:test_models",
+        "//testing",
+        "//third_party:androidx_test_ext_truth",
+        "//third_party:robolectric_android-all",
+    ],
+)
+
+oppia_android_test(
+    name = "StringExtensionsTest",
+    srcs = ["StringExtensionsTest.kt"],
+    custom_package = "org.oppia.android.util.extensions",
+    test_class = "org.oppia.android.util.extensions.StringExtensionsTest",
+    test_manifest = "//utility:test_manifest",
+    deps = [
+        "//testing",
+        "//third_party:robolectric_android-all",
+    ],
+)
diff --git a/utility/src/test/java/org/oppia/android/util/extensions/BundleExtensionsTest.kt b/utility/src/test/java/org/oppia/android/util/extensions/BundleExtensionsTest.kt
index 384ff2df1f2..28f33f1cd7c 100644
--- a/utility/src/test/java/org/oppia/android/util/extensions/BundleExtensionsTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/extensions/BundleExtensionsTest.kt
@@ -126,7 +126,7 @@ class BundleExtensionsTest {
     val bundle = Bundle()
     bundle.putProto("test_proto_key", TEST_MESSAGE_WITH_STR_AND_INT)
 
-    // Retrieve a "newer" version of the proto (using a proto that's binary-compatible).
+    // Retrieve a "newer" version of the proto (using a proto that is binary-compatible).
     val testMessage = bundle.getProto(
       "test_proto_key", defaultValue = TestMessage2.getDefaultInstance()
     )
diff --git a/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt b/utility/src/test/java/org/oppia/android/util/extensions/StringExtensionsTest.kt
similarity index 56%
rename from domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt
rename to utility/src/test/java/org/oppia/android/util/extensions/StringExtensionsTest.kt
index 4e42340ba6b..fa2df813f06 100644
--- a/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/extensions/StringExtensionsTest.kt
@@ -1,11 +1,9 @@
-package org.oppia.android.domain.util
+package org.oppia.android.util.extensions
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.oppia.android.util.extensions.normalizeWhitespace
-import org.oppia.android.util.extensions.removeWhitespace
 import org.robolectric.annotation.LooperMode
 
 /** Tests for [StringExtensions]. */
@@ -61,4 +59,46 @@ class StringExtensionsTest {
 
     assertThat(stringWithSpaces.removeWhitespace()).isEqualTo("1:22:3")
   }
+
+  @Test
+  fun testContainsPlaceHolderRegex_stringWithPlaceholder_returnsTrue() {
+    val stringWithPlaceholder = "Hello %s!"
+
+    assertThat(stringWithPlaceholder.containsPlaceholderRegex()).isTrue()
+  }
+
+  @Test
+  fun testContainsPlaceHolderRegex_stringWithMultiplePlaceholders_returnsTrue() {
+    val stringWithMultiplePlaceholders = "Value1: %d, Value2: %f"
+
+    assertThat(stringWithMultiplePlaceholders.containsPlaceholderRegex()).isTrue()
+  }
+
+  @Test
+  fun testContainsPlaceHolderRegex_stringWithIndexedPlaceholders_returnsTrue() {
+    val stringWithIndexedPlaceholders = "Indexed placeholders: %1\$s (string) and %2\$d (integer)."
+
+    assertThat(stringWithIndexedPlaceholders.containsPlaceholderRegex()).isTrue()
+  }
+
+  @Test
+  fun testContainsPlaceHolderRegex_stringWithoutPlaceholder_returnsFalse() {
+    val stringWithoutPlaceholder = "String without any placeholder."
+
+    assertThat(stringWithoutPlaceholder.containsPlaceholderRegex()).isFalse()
+  }
+
+  @Test
+  fun testContainsPlaceHolderRegex_emptyString_returnsFalse() {
+    val emptyString = ""
+
+    assertThat(emptyString.containsPlaceholderRegex()).isFalse()
+  }
+
+  @Test
+  fun testContainsPlaceHolderRegex_stringWithInvalidPlacholder_returnsFalse() {
+    val stringWithInvalidPlaceholder = "Progress: 44%"
+
+    assertThat(stringWithInvalidPlaceholder.containsPlaceholderRegex()).isFalse()
+  }
 }
diff --git a/utility/src/test/java/org/oppia/android/util/platformparameter/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/platformparameter/BUILD.bazel
new file mode 100644
index 00000000000..d2d277181c7
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/platformparameter/BUILD.bazel
@@ -0,0 +1,17 @@
+"""
+Tests for platform_parameter-specific utilities.
+"""
+
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "PlatformParameterSingletonTest",
+    srcs = ["PlatformParameterSingletonTest.kt"],
+    custom_package = "org.oppia.android.util.platformparameter",
+    test_class = "org.oppia.android.util.platformparameter.PlatformParameterSingletonTest",
+    test_manifest = "//utility:test_manifest",
+    deps = [
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner",
+    ],
+)
diff --git a/domain/src/test/java/org/oppia/android/domain/platformparameter/PlatformParameterSingletonTest.kt b/utility/src/test/java/org/oppia/android/util/platformparameter/PlatformParameterSingletonTest.kt
similarity index 97%
rename from domain/src/test/java/org/oppia/android/domain/platformparameter/PlatformParameterSingletonTest.kt
rename to utility/src/test/java/org/oppia/android/util/platformparameter/PlatformParameterSingletonTest.kt
index 8be5d7815e0..b7afb0464c5 100644
--- a/domain/src/test/java/org/oppia/android/domain/platformparameter/PlatformParameterSingletonTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/platformparameter/PlatformParameterSingletonTest.kt
@@ -1,4 +1,4 @@
-package org.oppia.android.domain.platformparameter
+package org.oppia.android.util.platformparameter
 
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
@@ -12,8 +12,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.PlatformParameter
-import org.oppia.android.util.platformparameter.PlatformParameterSingleton
-import org.oppia.android.util.platformparameter.PlatformParameterValue
+import org.oppia.android.domain.platformparameter.PlatformParameterSingletonImpl
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject