diff --git a/app/src/main/java/org/oppia/app/activity/ActivityComponent.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/activity/ActivityComponent.kt
rename to app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt
diff --git a/app/src/main/java/org/oppia/app/activity/ActivityModule.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/activity/ActivityModule.kt
rename to app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt
diff --git a/app/src/main/java/org/oppia/app/activity/ActivityScope.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/activity/ActivityScope.kt
rename to app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt
diff --git a/app/src/main/java/org/oppia/app/activity/InjectableAppCompatActivity.kt b/app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/activity/InjectableAppCompatActivity.kt
rename to app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsActivity.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsFragment.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/LoadAppVersionListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/LoadAppVersionListener.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/LoadProfileListListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/LoadProfileListListener.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/RouteToAppVersionListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/RouteToAppVersionListener.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/RouteToProfileListListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/RouteToProfileListListener.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionActivity.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionFragment.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/application/ActivityComponentFactory.kt b/app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ActivityComponentFactory.kt
rename to app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationComponent.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationContext.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationContext.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationInjector.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationInjector.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationInjectorProvider.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationInjectorProvider.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationModule.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationModule.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt
diff --git a/app/src/main/java/org/oppia/app/application/ApplicationStartupListenerModule.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/ApplicationStartupListenerModule.kt
rename to app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt
diff --git a/app/src/main/java/org/oppia/app/application/OppiaApplication.kt b/app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/application/OppiaApplication.kt
rename to app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListActivity.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListActivity.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListFragment.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListFragment.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/completedstorylist/CompletedStoryListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt b/app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt
rename to app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt
diff --git a/app/src/main/java/org/oppia/app/customview/SegmentedCircularProgressView.kt b/app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/SegmentedCircularProgressView.kt
rename to app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt
diff --git a/app/src/main/java/org/oppia/app/customview/interaction/FractionInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/interaction/FractionInputInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/customview/interaction/NumericInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/interaction/NumericInputInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/customview/interaction/RatioInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/interaction/RatioInputInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/customview/interaction/TextInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/customview/interaction/TextInputInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/databinding/DrawableBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/DrawableBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/EditTextBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/EditTextBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/GuidelineBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/GuidelineBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/ImageViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/ImageViewBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/MarginBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/MarginBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/StateAssemblerMarginBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/StateAssemblerMarginBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/StateAssemblerPaddingBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/StateAssemblerPaddingBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/TextViewBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/databinding/ViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/databinding/ViewBindingAdapters.java
rename to app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java
diff --git a/app/src/main/java/org/oppia/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/deprecation/DeprecationNoticeExitAppListener.kt b/app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/deprecation/DeprecationNoticeExitAppListener.kt
rename to app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/ExitProfileDialogFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/ExitProfileDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/ExitProfileDialogInterface.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/ExitProfileDialogInterface.kt
rename to app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogInterface.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerFooterViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/NavigationDrawerFooterViewModel.kt
rename to app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragment.kt
rename to app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/NavigationDrawerHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/NavigationDrawerItem.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/NavigationDrawerItem.kt
rename to app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt
diff --git a/app/src/main/java/org/oppia/app/drawer/RouteToProfileProgressListener.kt b/app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/drawer/RouteToProfileProgressListener.kt
rename to app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt
diff --git a/app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/fragment/FragmentComponent.kt
rename to app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt
diff --git a/app/src/main/java/org/oppia/app/fragment/FragmentModule.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/fragment/FragmentModule.kt
rename to app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt
diff --git a/app/src/main/java/org/oppia/app/fragment/FragmentScope.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/fragment/FragmentScope.kt
rename to app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt
diff --git a/app/src/main/java/org/oppia/app/fragment/InjectableDialogFragment.kt b/app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/fragment/InjectableDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/fragment/InjectableFragment.kt b/app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/fragment/InjectableFragment.kt
rename to app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpActivity.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpActivity.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpActivity.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpFragment.kt b/app/src/main/java/org/oppia/android/app/help/HelpFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpFragment.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpFragment.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpItemViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpItems.kt b/app/src/main/java/org/oppia/android/app/help/HelpItems.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpItems.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpItems.kt
diff --git a/app/src/main/java/org/oppia/app/help/HelpListViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/HelpListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/RouteToFAQListListener.kt b/app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/RouteToFAQListListener.kt
rename to app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListActivity.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/FAQListActivity.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/FAQListActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListFragment.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/FAQListFragment.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/FAQListFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/FAQListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/RouteToFAQSingleListener.kt b/app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/RouteToFAQSingleListener.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQContentViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQContentViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQItemViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/faqsingle/FAQSingleActivity.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/faqsingle/FAQSingleActivity.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt
diff --git a/app/src/main/java/org/oppia/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/ExpandedHintListIndexListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/ExpandedHintListIndexListener.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionAdapter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionAdapter.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionItemViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionListener.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsDividerViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsDividerViewModel.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/HintsViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/HintsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/RevealHintListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/RevealHintListener.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/RevealSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/RevealSolutionDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/RevealSolutionInterface.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/RevealSolutionInterface.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt
diff --git a/app/src/main/java/org/oppia/app/hintsandsolution/SolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/hintsandsolution/SolutionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/HomeActivity.kt
rename to app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
diff --git a/app/src/main/java/org/oppia/app/home/HomeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/HomeActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/home/HomeFragment.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/HomeFragment.kt
rename to app/src/main/java/org/oppia/android/app/home/HomeFragment.kt
diff --git a/app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/home/HomeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/HomeItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/RouteToExplorationListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/RouteToExplorationListener.kt
rename to app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/RouteToRecentlyPlayedListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/RouteToRecentlyPlayedListener.kt
rename to app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/RouteToTopicListener.kt
rename to app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/RouteToTopicPlayStoryListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/RouteToTopicPlayStoryListener.kt
rename to app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/UserAppHistoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/UserAppHistoryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/UserAppHistoryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/UserAppHistoryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/WelcomeViewModel.kt b/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/WelcomeViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingListAdapter.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryClickListener.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryClickListener.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedActivity.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedFragment.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedFragment.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/recentlyplayed/SectionTitleViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/recentlyplayed/SectionTitleViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/AllTopicsViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/AllTopicsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryListAdapter.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/PromotedStoryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/TopicListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/TopicListAdapter.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/TopicSummaryClickListener.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/TopicSummaryClickListener.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt
diff --git a/app/src/main/java/org/oppia/app/home/topiclist/TopicSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/home/topiclist/TopicSummaryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/DownloadsTabFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/DownloadsTabFragment.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/DownloadsTabFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/DownloadsTabFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsActivity.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsActivity.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsFragment.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsTab.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsTab.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/MyDownloadsViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/MyDownloadsViewPagerAdapter.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/UpdatesTabFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/UpdatesTabFragment.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt
diff --git a/app/src/main/java/org/oppia/app/mydownloads/UpdatesTabFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/mydownloads/UpdatesTabFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboadingSlideViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboadingSlideViewModel.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingActivity.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingActivity.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingFragment.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingFragment.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingNavigationListener.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingNavigationListener.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingPagerAdapter.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingSlideFinalViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingSlideFinalViewModel.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboardingViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/OnboardingViewModel.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/RouteToProfileListListener.kt b/app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/RouteToProfileListListener.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt
diff --git a/app/src/main/java/org/oppia/app/onboarding/ViewPagerSlide.kt b/app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/onboarding/ViewPagerSlide.kt
rename to app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivity.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivity.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListFragment.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListFragment.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/AppLanguageActivity.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/AppLanguageActivity.kt
rename to app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt
diff --git a/app/src/main/java/org/oppia/app/options/AppLanguageActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/AppLanguageActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/AppLanguageFragment.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/AppLanguageFragment.kt
rename to app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt
diff --git a/app/src/main/java/org/oppia/app/options/AppLanguageFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/AppLanguageFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/DefaultAudioActivity.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/DefaultAudioActivity.kt
rename to app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt
diff --git a/app/src/main/java/org/oppia/app/options/DefaultAudioActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/DefaultAudioActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/DefaultAudioFragment.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/DefaultAudioFragment.kt
rename to app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt
diff --git a/app/src/main/java/org/oppia/app/options/DefaultAudioFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/DefaultAudioFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/LanguageSelectionAdapter.kt b/app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/LanguageSelectionAdapter.kt
rename to app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/options/LoadAppLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/LoadAppLanguageListListener.kt
rename to app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt
diff --git a/app/src/main/java/org/oppia/app/options/LoadAudioLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/LoadAudioLanguageListListener.kt
rename to app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt
diff --git a/app/src/main/java/org/oppia/app/options/LoadReadingTextSizeListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/LoadReadingTextSizeListener.kt
rename to app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionControlsViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionControlsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsActivity.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsActivity.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsAppLanguageViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsAppLanguageViewModel.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsAudioLanguageViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsAudioLanguageViewModel.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsFragment.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsFragment.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/OptionsReadingTextSizeViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/OptionsReadingTextSizeViewModel.kt
rename to app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/options/ReadingTextSizeActivity.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/ReadingTextSizeActivity.kt
rename to app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt
diff --git a/app/src/main/java/org/oppia/app/options/ReadingTextSizeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/ReadingTextSizeActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/ReadingTextSizeFragment.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/ReadingTextSizeFragment.kt
rename to app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt
diff --git a/app/src/main/java/org/oppia/app/options/ReadingTextSizeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/ReadingTextSizeFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/options/RouteToAppLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/RouteToAppLanguageListListener.kt
rename to app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt
diff --git a/app/src/main/java/org/oppia/app/options/RouteToAudioLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/RouteToAudioLanguageListListener.kt
rename to app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt
diff --git a/app/src/main/java/org/oppia/app/options/RouteToReadingTextSizeListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/options/RouteToReadingTextSizeListener.kt
rename to app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt
diff --git a/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt
rename to app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt
diff --git a/app/src/main/java/org/oppia/app/parser/StringToNumberParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/parser/StringToNumberParser.kt
rename to app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt
diff --git a/app/src/main/java/org/oppia/app/parser/StringToRatioParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/parser/StringToRatioParser.kt
rename to app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/AudioButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/AudioFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/AudioFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioUiManager.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/AudioUiManager.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/AudioViewModel.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/AudioViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/CellularAudioDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/CellularAudioDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/CellularDataInterface.kt b/app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/CellularDataInterface.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/LanguageDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/LanguageDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/audio/LanguageInterface.kt b/app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/audio/LanguageInterface.kt
rename to app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/DefaultFontSizeStateListener.kt b/app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/DefaultFontSizeStateListener.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationActivity.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationManagerFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationManagerFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationManagerFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/ExplorationViewModel.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/ExplorationViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt
rename to app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/DragDropSortInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/DragDropSortInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/ImageRegionSelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/ImageRegionSelectionInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt
rename to app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragment.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/StateFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/StatePlayerRecyclerViewAssembler.kt b/app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/StatePlayerRecyclerViewAssembler.kt
rename to app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/StateViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt
rename to app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerHandler.kt b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerHandler.kt
rename to app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt
rename to app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt
rename to app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt
rename to app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt
rename to app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt
rename to app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContentViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/FeedbackViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/FeedbackViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/InteractionViewModelFactory.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/InteractionViewModelFactory.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/InteractionViewModelModule.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/InteractionViewModelModule.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/NextButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/NextButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/NumericInputViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/NumericInputViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ReplayButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ReplayButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/StateItemViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/StateItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/SubmitButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/SubmitButtonViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/TextInputViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/itemviewmodel/TextInputViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/ContinueNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/ContinueNavigationButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/NextNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/NextNavigationButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/PreviousNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/PreviousNavigationButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/PreviousResponsesHeaderClickListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/PreviousResponsesHeaderClickListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/ReplayButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/ReplayButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/RouteToHintsAndSolutionListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/RouteToHintsAndSolutionListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/ShowHintAvailabilityListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/ShowHintAvailabilityListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/StateKeyboardButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/StateKeyboardButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/listener/SubmitNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/listener/SubmitNavigationButtonListener.kt
rename to app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/state/testing/StateFragmentTestViewModel.kt
rename to app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/player/stopplaying/RestartPlayingSessionListener.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/stopplaying/RestartPlayingSessionListener.kt
rename to app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt
diff --git a/app/src/main/java/org/oppia/app/player/stopplaying/StopExplorationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/stopplaying/StopExplorationDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/player/stopplaying/StopStatePlayingSessionListener.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/player/stopplaying/StopStatePlayingSessionListener.kt
rename to app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AddProfileActivity.kt
rename to app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AddProfileActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AddProfileActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AddProfileViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AddProfileViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminAuthActivity.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminAuthActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminAuthActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminAuthEnum.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminAuthEnum.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminAuthViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminAuthViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminPinActivity.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminPinActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminPinActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminPinViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminPinViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminSettingsDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminSettingsDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminSettingsDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminSettingsDialogFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/AdminSettingsViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/AdminSettingsViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordActivity.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/PinPasswordActivity.kt
rename to app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/PinPasswordViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserActivity.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileChooserActivity.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileChooserActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileChooserViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileInputView.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileInputView.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ProfileRouteDialogInterface.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ProfileRouteDialogInterface.kt
rename to app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ResetPinDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profile/ResetPinViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/ResetPinViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profile/RouteToAdminPinListener.kt b/app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profile/RouteToAdminPinListener.kt
rename to app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivity.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureClickListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureClickListener.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureDialogInterface.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureDialogInterface.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfilePictureEditDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfilePictureEditDialogFragment.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressActivity.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressFragment.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressFragment.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressItemViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/ProfileProgressViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/ProfileProgressViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/RouteToCompletedStoryListListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/RouteToCompletedStoryListListener.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt
diff --git a/app/src/main/java/org/oppia/app/profileprogress/RouteToOngoingTopicListListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/profileprogress/RouteToOngoingTopicListListener.kt
rename to app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt b/app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/DividerItemDecorator.kt b/app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/DividerItemDecorator.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/DragAndDropItemFacilitator.kt b/app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/DragAndDropItemFacilitator.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/OnDragEndedListener.kt b/app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/OnDragEndedListener.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/OnItemDragListener.kt b/app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/OnItemDragListener.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt
diff --git a/app/src/main/java/org/oppia/app/recyclerview/RecyclerViewBindingAdapter.java b/app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/RecyclerViewBindingAdapter.java
rename to app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java
diff --git a/app/src/main/java/org/oppia/app/recyclerview/StartSnapHelper.kt b/app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/recyclerview/StartSnapHelper.kt
rename to app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileEditActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileEditActivity.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileEditActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileEditActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileEditViewModel.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileListActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileListActivity.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileListActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileListFragment.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileListFragment.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileListFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileListViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileListViewModel.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileRenameActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileRenameActivity.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileRenameActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileRenameActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileRenameViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileRenameViewModel.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinActivity.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/settings/profile/ProfileResetPinViewModel.kt
rename to app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/IntentFactoryShim.kt
rename to app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
diff --git a/app/src/main/java/org/oppia/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/IntentFactoryShimImpl.kt
rename to app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
diff --git a/app/src/main/java/org/oppia/app/shim/IntentFactoryShimModule.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/IntentFactoryShimModule.kt
rename to app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt
diff --git a/app/src/main/java/org/oppia/app/shim/ViewBindingShim.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/ViewBindingShim.kt
rename to app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt
diff --git a/app/src/main/java/org/oppia/app/shim/ViewBindingShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/ViewBindingShimImpl.kt
rename to app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt
diff --git a/app/src/main/java/org/oppia/app/shim/ViewBindingShimModule.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/ViewBindingShimModule.kt
rename to app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt
diff --git a/app/src/main/java/org/oppia/app/shim/ViewComponentFactory.kt b/app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/shim/ViewComponentFactory.kt
rename to app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt
diff --git a/app/src/main/java/org/oppia/app/splash/SplashActivity.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/splash/SplashActivity.kt
rename to app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt
diff --git a/app/src/main/java/org/oppia/app/splash/SplashActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/splash/SplashActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/story/ExplorationSelectionListener.kt b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/ExplorationSelectionListener.kt
rename to app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryActivity.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryFragment.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryFragmentScroller.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryFragmentScroller.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt
diff --git a/app/src/main/java/org/oppia/app/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/StoryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/story/storyitemviewmodel/StoryItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/BindableAdapterTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragment.kt
rename to app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt
diff --git a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/BindableAdapterTestFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/BindableAdapterTestViewModel.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/BindableAdapterTestViewModel.kt
rename to app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ConceptCardFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ConceptCardFragmentTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ConceptCardFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ConceptCardFragmentTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/DragDropTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/DragDropTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/DragDropTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/DragDropTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ExplorationInjectionActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ExplorationInjectionActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ExplorationTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ExplorationTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/HomeInjectionActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/HomeInjectionActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/HomeTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/HomeTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/HomeTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/HomeTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/HtmlParserTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestFragment.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestFragment.kt
rename to app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ImageRegionSelectionTestFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/InputInteractionViewTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/NavigationDrawerTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ProfileChooserFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ProfileChooserFragmentTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/ProfileChooserFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/ProfileChooserFragmentTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TopicTestActivity.kt
rename to app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
diff --git a/app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/testing/TopicTestActivityForStory.kt
rename to app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
diff --git a/app/src/main/java/org/oppia/app/topic/RouteToConceptCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/RouteToConceptCardListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/RouteToQuestionPlayerListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/RouteToQuestionPlayerListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/RouteToRevisionCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/RouteToRevisionCardListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/RouteToStoryListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/RouteToStoryListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicActivity.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicFragment.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicTab.kt b/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicTab.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicTab.kt
diff --git a/app/src/main/java/org/oppia/app/topic/TopicViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/TopicViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/ViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/ViewPagerAdapter.kt
rename to app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragment.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/info/TopicInfoFragment.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/info/TopicInfoFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/info/TopicInfoFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/info/TopicInfoFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/info/TopicInfoViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/info/TopicInfoViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/ChapterSummaryAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/ChapterSummaryAdapter.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/ChapterSummarySelector.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/ChapterSummarySelector.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/ExpandedChapterListIndexListener.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/ExpandedChapterListIndexListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/StorySummaryAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/StorySummaryAdapter.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/StorySummarySelector.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/StorySummarySelector.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/StorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/StorySummaryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragment.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsTitleViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsTitleViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/SubtopicSelector.kt b/app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/SubtopicSelector.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragment.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/TopicPracticeViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/TopicPracticeViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revision/RevisionSubtopicSelector.kt b/app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revision/RevisionSubtopicSelector.kt
rename to app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragment.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revision/TopicRevisionViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revision/TopicRevisionViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/ReturnToTopicClickListener.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/ReturnToTopicClickListener.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivity.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivity.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragment.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragment.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardViewModel.kt
rename to app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/utility/ClickableAreasImage.kt b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/ClickableAreasImage.kt
rename to app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
diff --git a/app/src/main/java/org/oppia/app/utility/ContextExtensions.kt b/app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/ContextExtensions.kt
rename to app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt
diff --git a/app/src/main/java/org/oppia/app/utility/FontScaleConfigurationUtil.kt b/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/FontScaleConfigurationUtil.kt
rename to app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt
diff --git a/app/src/main/java/org/oppia/app/utility/KeyboardHelper.kt b/app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/KeyboardHelper.kt
rename to app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt
diff --git a/app/src/main/java/org/oppia/app/utility/LifecycleSafeTimerFactory.kt b/app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/LifecycleSafeTimerFactory.kt
rename to app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt
diff --git a/app/src/main/java/org/oppia/app/utility/OnClickableAreaClickedListener.kt b/app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/OnClickableAreaClickedListener.kt
rename to app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt
diff --git a/app/src/main/java/org/oppia/app/utility/RatioExtensions.kt b/app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/RatioExtensions.kt
rename to app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt
diff --git a/app/src/main/java/org/oppia/app/utility/RegionClickEvent.kt b/app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/RegionClickEvent.kt
rename to app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt
diff --git a/app/src/main/java/org/oppia/app/utility/SplitScreenManager.kt b/app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/utility/SplitScreenManager.kt
rename to app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt
diff --git a/app/src/main/java/org/oppia/app/view/ViewComponent.kt b/app/src/main/java/org/oppia/android/app/view/ViewComponent.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/view/ViewComponent.kt
rename to app/src/main/java/org/oppia/android/app/view/ViewComponent.kt
diff --git a/app/src/main/java/org/oppia/app/view/ViewScope.kt b/app/src/main/java/org/oppia/android/app/view/ViewScope.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/view/ViewScope.kt
rename to app/src/main/java/org/oppia/android/app/view/ViewScope.kt
diff --git a/app/src/main/java/org/oppia/app/viewmodel/ObservableArrayList.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/viewmodel/ObservableArrayList.kt
rename to app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt
diff --git a/app/src/main/java/org/oppia/app/viewmodel/ObservableViewModel.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/viewmodel/ObservableViewModel.kt
rename to app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/viewmodel/ViewModelBridgeFactory.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/viewmodel/ViewModelBridgeFactory.kt
rename to app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt
diff --git a/app/src/main/java/org/oppia/app/viewmodel/ViewModelProvider.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/viewmodel/ViewModelProvider.kt
rename to app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivity.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivity.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityListener.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughActivityPresenter.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughFragmentChangeListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughFragmentChangeListener.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughPageChanger.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughPageChanger.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughPages.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughPages.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/WalkthroughViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/WalkthroughViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughEndPageChanger.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughEndPageChanger.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalFragment.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalListener.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
diff --git a/app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt
similarity index 100%
rename from app/src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt
rename to app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/administratorcontrols/AdministratorControlsActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/administratorcontrols/AppVersionActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/administratorcontrols/AppVersionActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/completedstorylist/CompletedStoryListActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/faq/FAQListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/faq/FAQSingleActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/faq/FAQSingleActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/help/HelpFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/home/HomeActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/home/RecentlyPlayedFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/mydownloads/MyDownloadsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/mydownloads/MyDownloadsFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/onboarding/OnboardingFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/onboarding/OnboardingFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/options/OptionsFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/parser/HtmlParserTest.kt b/app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/parser/HtmlParserTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/parser/RichTextViewMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/parser/RichTextViewMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/parser/RichTextViewMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/parser/RichTextViewMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/player/exploration/ExplorationActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/player/state/StateFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profile/AddProfileActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/AdminAuthActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profile/AdminAuthActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/AdminPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profile/AdminPinActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profileprogress/ProfilePictureActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profileprogress/ProfilePictureActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/profileprogress/ProfileProgressFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/recyclerview/BindableAdapterTest.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/recyclerview/BindableAdapterTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/recyclerview/RecyclerViewMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/recyclerview/RecyclerViewMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileEditActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileEditActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileRenameActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileRenameActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileResetPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/settings/profile/ProfileResetPinActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/splash/SplashActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/story/StoryFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/DragDropTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/DragDropTestActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/ImageRegionSelectionInteractionViewTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/ImageRegionSelectionInteractionViewTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/InputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/InputInteractionViewTestActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/NavigationDrawerTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/NavigationDrawerTestActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/testing/TopicTestActivityForStoryTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/TopicFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/info/TopicInfoFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/lessons/TopicLessonsFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/practice/TopicPracticeFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/revision/TopicRevisionFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/ClickActions.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/ClickActions.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/DragViewAction.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/DragViewAction.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/DrawableMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/DrawableMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/EspressoTestsMatchers.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/EspressoTestsMatchers.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/FontSizeMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/FontSizeMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/MockitoKotlinHelper.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/MockitoKotlinHelper.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/OrientationChangeAction.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/OrientationChangeAction.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/ProgressMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/ProgressMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/RatioExtensionsTest.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/RatioExtensionsTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/utility/TabMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/utility/TabMatcher.kt
rename to app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughActivityTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughFinalFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughTopicListFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
diff --git a/app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
similarity index 100%
rename from app/src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
rename to app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/home/HomeActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/home/HomeActivityLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/parser/StringToRatioParserTest.kt b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/parser/StringToRatioParserTest.kt
rename to app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt
diff --git a/app/src/test/java/org/oppia/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/player/exploration/ExplorationActivityLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/player/state/StateFragmentLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/story/StoryActivityLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/CompletedStoryListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/CompletedStoryListSpanTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/OngoingTopicListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/OngoingTopicListSpanTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/ProfileChooserSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/ProfileChooserSpanTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/ProfileProgressSpanCount.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/ProfileProgressSpanCount.kt
rename to app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt
diff --git a/app/src/test/java/org/oppia/app/testing/TopicRevisionSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/TopicRevisionSpanTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/options/AppLanguageFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/options/AppLanguageFragmentTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/options/DefaultAudioFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/options/DefaultAudioFragmentTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/options/OptionsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/options/OptionsFragmentTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/options/ReadingTextSizeFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/options/ReadingTextSizeFragmentTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt
diff --git a/app/src/test/java/org/oppia/app/testing/player/split/PlayerSplitScreenTesting.kt b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/player/split/PlayerSplitScreenTesting.kt
rename to app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt
diff --git a/app/src/test/java/org/oppia/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/testing/player/state/StateFragmentAccessibilityTest.kt
rename to app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
diff --git a/app/src/test/java/org/oppia/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/topic/info/TopicInfoFragmentLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt
diff --git a/app/src/test/java/org/oppia/app/topic/revisioncard/RevisionCardActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
similarity index 100%
rename from app/src/test/java/org/oppia/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
rename to app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
diff --git a/data/src/main/java/org/oppia/data/Constants.kt b/data/src/main/java/org/oppia/android/data/Constants.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/Constants.kt
rename to data/src/main/java/org/oppia/android/data/Constants.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/NetworkInterceptor.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/NetworkInterceptor.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/NetworkModule.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/NetworkModule.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/NetworkSettings.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/NetworkSettings.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/ClassroomService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/ClassroomService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/ConceptCardService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/ConceptCardService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/ExplorationService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/ExplorationService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/QuestionPlayerService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/QuestionPlayerService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/StoryService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/StoryService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/SubtopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/SubtopicService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/api/TopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/api/TopicService.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeAnswerGroup.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeAnswerGroup.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeClassroom.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeClassroom.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeConceptCard.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeConceptCard.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeCustomizationArgs.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeCustomizationArgs.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeExpSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeExpSummary.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeExploration.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeExploration.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeExplorationContainer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeExplorationContainer.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeHint.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeHint.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeInteractionInstance.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeInteractionInstance.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeOutcome.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeOutcome.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeParamChange.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeParamChange.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeParamSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeParamSpec.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeQuestion.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeQuestion.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeQuestionPlayer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeQuestionPlayer.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeRecordedVoiceovers.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeRecordedVoiceovers.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeRuleSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeRuleSpec.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSkillContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSkillContents.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSolution.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSolution.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeState.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeState.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeStateClassifier.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeStateClassifier.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeStory.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeStory.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeStoryNode.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeStoryNode.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeStorySummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeStorySummary.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtitledHtml.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtitledHtml.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopic.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopicPageContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopicPageContents.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeSubtopicSummary.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeTopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeTopic.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeTopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeTopicSummary.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeVoiceover.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeVoiceover.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeWrittenTranslation.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeWrittenTranslation.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt
diff --git a/data/src/main/java/org/oppia/data/backends/gae/model/GaeWrittenTranslations.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/backends/gae/model/GaeWrittenTranslations.kt
rename to data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt
diff --git a/data/src/main/java/org/oppia/data/persistence/PersistentCacheStore.kt b/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt
similarity index 100%
rename from data/src/main/java/org/oppia/data/persistence/PersistentCacheStore.kt
rename to data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt
diff --git a/data/src/test/java/org/oppia/data/backends/ApiUtils.kt b/data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/ApiUtils.kt
rename to data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockClassroomService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockClassroomService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockConceptCardService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockConceptCardService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockExplorationService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockExplorationService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockQuestionPlayerService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockQuestionPlayerService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockStoryService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockStoryService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockSubtopicService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockSubtopicService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/api/MockTopicService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/api/MockTopicService.kt
rename to data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockClassroomTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockClassroomTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockConceptCardTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockConceptCardTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockExplorationTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockExplorationTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockQuestionPlayerTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockQuestionPlayerTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockStoryTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockStoryTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockSubtopicTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockSubtopicTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/MockTopicTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/MockTopicTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt
diff --git a/data/src/test/java/org/oppia/data/backends/test/NetworkInterceptorTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/backends/test/NetworkInterceptorTest.kt
rename to data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt
diff --git a/data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt b/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt
similarity index 100%
rename from data/src/test/java/org/oppia/data/persistence/PersistentCacheStoreTest.kt
rename to data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt
diff --git a/domain/src/main/java/org/oppia/domain/audio/AudioPlayerController.kt b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/audio/AudioPlayerController.kt
rename to domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt
diff --git a/domain/src/main/java/org/oppia/domain/audio/CellularAudioDialogController.kt b/domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/audio/CellularAudioDialogController.kt
rename to domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/AnswerClassificationController.kt b/domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/AnswerClassificationController.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/GenericInteractionClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/GenericInteractionClassifier.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/InteractionClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/InteractionClassifier.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/InteractionsModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/InteractionsModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/RuleClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/RuleClassifier.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/GenericRuleClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/GenericRuleClassifier.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/RuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/RuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/RuleQualifiers.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/RuleQualifiers.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/continueinteraction/ContinueModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/continueinteraction/ContinueModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/fractioninput/FractionInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/numericinput/NumericInputRuleModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/ratioinput/RatioInputModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputRuleModule.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/exploration/ExplorationDataController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/exploration/ExplorationDataController.kt
rename to domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
diff --git a/domain/src/main/java/org/oppia/domain/exploration/ExplorationProgress.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/exploration/ExplorationProgress.kt
rename to domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
diff --git a/domain/src/main/java/org/oppia/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/exploration/ExplorationProgressController.kt
rename to domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
diff --git a/domain/src/main/java/org/oppia/domain/exploration/ExplorationRetriever.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/exploration/ExplorationRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/AppStartupStateController.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/AppStartupStateController.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetriever.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetrieverModule.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/ExpirationMetaDataRetrieverModule.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/ApplicationStartupListener.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/ApplicationStartupListener.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/LogStorageModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/LogStorageModule.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/OppiaLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/OppiaLogger.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/analytics/AnalyticsController.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/exceptions/ExceptionsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/exceptions/ExceptionsController.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkManagerInitializer.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkManagerInitializer.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkManagerInitializer.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkManagerInitializer.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorker.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorker.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerFactory.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerModule.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/oppialogger/loguploader/WorkManagerConfigurationModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/WorkManagerConfigurationModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/oppialogger/loguploader/WorkManagerConfigurationModule.kt
rename to domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/WorkManagerConfigurationModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/profile/ProfileManagementController.kt b/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/profile/ProfileManagementController.kt
rename to domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgress.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgress.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionConstantsProvider.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionConstantsProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionRetriever.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionTrainingConstantsProvider.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionTrainingConstantsProvider.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt
diff --git a/domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt
rename to domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt
diff --git a/domain/src/main/java/org/oppia/domain/state/StateDeck.kt b/domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/state/StateDeck.kt
rename to domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt
diff --git a/domain/src/main/java/org/oppia/domain/state/StateGraph.kt b/domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/state/StateGraph.kt
rename to domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt
diff --git a/domain/src/main/java/org/oppia/domain/state/StateList.kt b/domain/src/main/java/org/oppia/android/domain/state/StateList.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/state/StateList.kt
rename to domain/src/main/java/org/oppia/android/domain/state/StateList.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/ConceptCardRetriever.kt b/domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/ConceptCardRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsController.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsController.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsControllerImpl.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsControllerImpl.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsControllerModule.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/PrimeTopicAssetsControllerModule.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/RevisionCardRetriever.kt b/domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/RevisionCardRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/StoryProgressController.kt b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/StoryProgressController.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/StoryProgressTestHelper.kt b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/StoryProgressTestHelper.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/TopicController.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
diff --git a/domain/src/main/java/org/oppia/domain/topic/TopicListController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/topic/TopicListController.kt
rename to domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/FloatExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/FloatExtensions.kt
rename to domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/FractionExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/FractionExtensions.kt
rename to domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/InteractionObjectExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/InteractionObjectExtensions.kt
rename to domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/JsonAssetRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/JsonAssetRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/RatioExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/RatioExtensions.kt
rename to domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/StateRetriever.kt
rename to domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
diff --git a/domain/src/main/java/org/oppia/domain/util/StringExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt
similarity index 100%
rename from domain/src/main/java/org/oppia/domain/util/StringExtensions.kt
rename to domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt
diff --git a/domain/src/test/java/org/oppia/domain/audio/AudioPlayerControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/audio/AudioPlayerControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsInclusivelyBetweenRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsInclusivelyBetweenRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsInclusivelyBetweenRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsInclusivelyBetweenRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt
rename to domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/onboarding/AppStartupStateControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/onboarding/AppStartupStateControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/OppiaLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/OppiaLoggerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/analytics/AnalyticsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/analytics/AnalyticsControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/exceptions/ExceptionsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkManagerInitializerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkManagerInitializerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkManagerInitializerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkManagerInitializerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/topic/StoryProgressTestHelperTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/topic/StoryProgressTestHelperTest.kt
rename to domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/topic/TopicControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt
rename to domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/util/InteractionObjectExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/util/InteractionObjectExtensionsTest.kt
rename to domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/util/RatioExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/util/RatioExtensionsTest.kt
rename to domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/util/StateRetrieverTest.kt b/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/util/StateRetrieverTest.kt
rename to domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt
diff --git a/domain/src/test/java/org/oppia/domain/util/StringExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt
similarity index 100%
rename from domain/src/test/java/org/oppia/domain/util/StringExtensionsTest.kt
rename to domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt
diff --git a/testing/src/main/java/org/oppia/testing/CoroutineExecutorService.kt b/testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/CoroutineExecutorService.kt
rename to testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt
diff --git a/testing/src/main/java/org/oppia/testing/EditTextInputAction.kt b/testing/src/main/java/org/oppia/android/testing/EditTextInputAction.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/EditTextInputAction.kt
rename to testing/src/main/java/org/oppia/android/testing/EditTextInputAction.kt
diff --git a/testing/src/main/java/org/oppia/testing/FakeEventLogger.kt b/testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/FakeEventLogger.kt
rename to testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt
diff --git a/testing/src/main/java/org/oppia/testing/FakeExceptionLogger.kt b/testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/FakeExceptionLogger.kt
rename to testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt
diff --git a/testing/src/main/java/org/oppia/testing/FakeSystemClock.kt b/testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/FakeSystemClock.kt
rename to testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt
diff --git a/testing/src/main/java/org/oppia/testing/IsOnRobolectric.kt b/testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/IsOnRobolectric.kt
rename to testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt
diff --git a/testing/src/main/java/org/oppia/testing/OppiaTestAnnotations.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/OppiaTestAnnotations.kt
rename to testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt
diff --git a/testing/src/main/java/org/oppia/testing/OppiaTestRule.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/OppiaTestRule.kt
rename to testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt
diff --git a/testing/src/main/java/org/oppia/testing/OppiaTestRunner.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/OppiaTestRunner.kt
rename to testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestAccessibilityModule.kt b/testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestAccessibilityModule.kt
rename to testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatcher.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatcher.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatcherEspressoImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatcherEspressoImpl.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatcherRobolectricImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatcherRobolectricImpl.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatchers.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatchers.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatchersEspressoImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatchersEspressoImpl.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestCoroutineDispatchersRobolectricImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestCoroutineDispatchersRobolectricImpl.kt
rename to testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestDispatcherModule.kt b/testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestDispatcherModule.kt
rename to testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestDispatchers.kt b/testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestDispatchers.kt
rename to testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt
diff --git a/testing/src/main/java/org/oppia/testing/TestLogReportingModule.kt b/testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/TestLogReportingModule.kt
rename to testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt
diff --git a/testing/src/main/java/org/oppia/testing/profile/ProfileTestHelper.kt b/testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt
similarity index 100%
rename from testing/src/main/java/org/oppia/testing/profile/ProfileTestHelper.kt
rename to testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt
diff --git a/testing/src/test/java/org/oppia/testing/CoroutineExecutorServiceTest.kt b/testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt
similarity index 100%
rename from testing/src/test/java/org/oppia/testing/CoroutineExecutorServiceTest.kt
rename to testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt
diff --git a/testing/src/test/java/org/oppia/testing/FakeEventLoggerTest.kt b/testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt
similarity index 100%
rename from testing/src/test/java/org/oppia/testing/FakeEventLoggerTest.kt
rename to testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt
diff --git a/testing/src/test/java/org/oppia/testing/FakeExceptionLoggerTest.kt b/testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt
similarity index 100%
rename from testing/src/test/java/org/oppia/testing/FakeExceptionLoggerTest.kt
rename to testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt
diff --git a/testing/src/test/java/org/oppia/testing/profile/ProfileTestHelperTest.kt b/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt
similarity index 100%
rename from testing/src/test/java/org/oppia/testing/profile/ProfileTestHelperTest.kt
rename to testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt
diff --git a/utility/src/main/java/org/oppia/util/accessibility/AccessibilityModule.kt b/utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/accessibility/AccessibilityModule.kt
rename to utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt
diff --git a/utility/src/main/java/org/oppia/util/accessibility/AndroidAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/accessibility/AndroidAccessibilityManager.kt
rename to utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt
diff --git a/utility/src/main/java/org/oppia/util/accessibility/CustomAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/accessibility/CustomAccessibilityManager.kt
rename to utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt
diff --git a/utility/src/main/java/org/oppia/util/accessibility/FakeAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/accessibility/FakeAccessibilityManager.kt
rename to utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt
diff --git a/utility/src/main/java/org/oppia/util/caching/AssetRepository.kt b/utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/caching/AssetRepository.kt
rename to utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt
diff --git a/utility/src/main/java/org/oppia/util/caching/CacheAssetsLocally.kt b/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/caching/CacheAssetsLocally.kt
rename to utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt
diff --git a/utility/src/main/java/org/oppia/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/caching/CachingModule.kt
rename to utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
diff --git a/utility/src/main/java/org/oppia/util/caching/TopicListToCache.kt b/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/caching/TopicListToCache.kt
rename to utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt
diff --git a/utility/src/main/java/org/oppia/util/caching/testing/CachingTestModule.kt b/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/caching/testing/CachingTestModule.kt
rename to utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt
diff --git a/utility/src/main/java/org/oppia/util/data/AsyncDataSubscriptionManager.kt b/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/AsyncDataSubscriptionManager.kt
rename to utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt
diff --git a/utility/src/main/java/org/oppia/util/data/AsyncResult.kt b/utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/AsyncResult.kt
rename to utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt
diff --git a/utility/src/main/java/org/oppia/util/data/DataProvider.kt b/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/DataProvider.kt
rename to utility/src/main/java/org/oppia/android/util/data/DataProvider.kt
diff --git a/utility/src/main/java/org/oppia/util/data/DataProviders.kt b/utility/src/main/java/org/oppia/android/util/data/DataProviders.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/DataProviders.kt
rename to utility/src/main/java/org/oppia/android/util/data/DataProviders.kt
diff --git a/utility/src/main/java/org/oppia/util/data/DataProvidersInjector.kt b/utility/src/main/java/org/oppia/android/util/data/DataProvidersInjector.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/DataProvidersInjector.kt
rename to utility/src/main/java/org/oppia/android/util/data/DataProvidersInjector.kt
diff --git a/utility/src/main/java/org/oppia/util/data/DataProvidersInjectorProvider.kt b/utility/src/main/java/org/oppia/android/util/data/DataProvidersInjectorProvider.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/DataProvidersInjectorProvider.kt
rename to utility/src/main/java/org/oppia/android/util/data/DataProvidersInjectorProvider.kt
diff --git a/utility/src/main/java/org/oppia/util/data/InMemoryBlockingCache.kt b/utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/data/InMemoryBlockingCache.kt
rename to utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt
diff --git a/utility/src/main/java/org/oppia/util/datetime/DateTimeUtil.kt b/utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/datetime/DateTimeUtil.kt
rename to utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt
diff --git a/utility/src/main/java/org/oppia/util/extensions/LiveDataExt.kt b/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/extensions/LiveDataExt.kt
rename to utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt
diff --git a/utility/src/main/java/org/oppia/util/gcsresource/GcsResouceAnnotations.kt b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/gcsresource/GcsResouceAnnotations.kt
rename to utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt
diff --git a/utility/src/main/java/org/oppia/util/gcsresource/GcsResourceModule.kt b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/gcsresource/GcsResourceModule.kt
rename to utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/ConsoleLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/ConsoleLogger.kt
rename to utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/EventBundleCreator.kt
rename to utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/EventLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/EventLogger.kt
rename to utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/ExceptionLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/ExceptionLogger.kt
rename to utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/LogLevel.kt b/utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/LogLevel.kt
rename to utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/LogUploader.kt b/utility/src/main/java/org/oppia/android/util/logging/LogUploader.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/LogUploader.kt
rename to utility/src/main/java/org/oppia/android/util/logging/LogUploader.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/LoggerModule.kt b/utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/LoggerModule.kt
rename to utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/LoggingAnnotations.kt b/utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/LoggingAnnotations.kt
rename to utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/firebase/FirebaseEventLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/firebase/FirebaseEventLogger.kt
rename to utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/firebase/FirebaseExceptionLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/firebase/FirebaseExceptionLogger.kt
rename to utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/firebase/FirebaseLogUploader.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseLogUploader.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/firebase/FirebaseLogUploader.kt
rename to utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseLogUploader.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/firebase/FirebaseLogUploaderModule.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseLogUploaderModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/firebase/FirebaseLogUploaderModule.kt
rename to utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseLogUploaderModule.kt
diff --git a/utility/src/main/java/org/oppia/util/logging/firebase/LogReportingModule.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/logging/firebase/LogReportingModule.kt
rename to utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt
diff --git a/utility/src/main/java/org/oppia/util/networking/NetworkConnectionUtil.kt b/utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/networking/NetworkConnectionUtil.kt
rename to utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/BulletTagHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/BulletTagHandler.kt
rename to utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/CustomBulletSpan.kt b/utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/CustomBulletSpan.kt
rename to utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/CustomHtmlContentHandler.kt
rename to utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ExplorationHtmlParserEntityType.kt b/utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ExplorationHtmlParserEntityType.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/GlideImageLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/GlideImageLoader.kt
rename to utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/GlideImageLoaderModule.kt b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/GlideImageLoaderModule.kt
rename to utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/HtmlParser.kt b/utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/HtmlParser.kt
rename to utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/HtmlParserEntityTypeModule.kt b/utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/HtmlParserEntityTypeModule.kt
rename to utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ImageAssetFetcher.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ImageAssetFetcher.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ImageLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ImageLoader.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ImageParsingAnnotations.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ImageParsingAnnotations.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ImageParsingModule.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ImageParsingModule.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/ImageTargets.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/ImageTargets.kt
rename to utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/RepositoryGlideModule.kt b/utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/RepositoryGlideModule.kt
rename to utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/RepositoryModelLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/RepositoryModelLoader.kt
rename to utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/SvgDecoder.kt b/utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/SvgDecoder.kt
rename to utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/SvgDrawableTranscoder.kt b/utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/SvgDrawableTranscoder.kt
rename to utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt
diff --git a/utility/src/main/java/org/oppia/util/parser/UrlImageParser.kt b/utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/parser/UrlImageParser.kt
rename to utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt
diff --git a/utility/src/main/java/org/oppia/util/profile/DirectoryManagementUtil.kt b/utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/profile/DirectoryManagementUtil.kt
rename to utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt
diff --git a/utility/src/main/java/org/oppia/util/statusbar/StatusBarColor.kt b/utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/statusbar/StatusBarColor.kt
rename to utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt
diff --git a/utility/src/main/java/org/oppia/util/system/OppiaClock.kt b/utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/system/OppiaClock.kt
rename to utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt
diff --git a/utility/src/main/java/org/oppia/util/system/OppiaDateTimeFormatter.kt b/utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/system/OppiaDateTimeFormatter.kt
rename to utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt
diff --git a/utility/src/main/java/org/oppia/util/threading/BackgroundDispatcher.kt b/utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/threading/BackgroundDispatcher.kt
rename to utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt
diff --git a/utility/src/main/java/org/oppia/util/threading/BlockingDispatcher.kt b/utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/threading/BlockingDispatcher.kt
rename to utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt
diff --git a/utility/src/main/java/org/oppia/util/threading/ConcurrentCollections.kt b/utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/threading/ConcurrentCollections.kt
rename to utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt
diff --git a/utility/src/main/java/org/oppia/util/threading/DispatcherModule.kt b/utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt
similarity index 100%
rename from utility/src/main/java/org/oppia/util/threading/DispatcherModule.kt
rename to utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt
diff --git a/utility/src/test/java/org/oppia/util/data/AsyncResultTest.kt b/utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/data/AsyncResultTest.kt
rename to utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt
diff --git a/utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt b/utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/data/DataProvidersTest.kt
rename to utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt
diff --git a/utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt b/utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt
rename to utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt
diff --git a/utility/src/test/java/org/oppia/util/datetime/DateTimeUtilTest.kt b/utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/datetime/DateTimeUtilTest.kt
rename to utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt
diff --git a/utility/src/test/java/org/oppia/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/logging/EventBundleCreatorTest.kt
rename to utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
diff --git a/utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt b/utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt
rename to utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt
diff --git a/utility/src/test/java/org/oppia/util/parser/CustomHtmlContentHandlerTest.kt b/utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/parser/CustomHtmlContentHandlerTest.kt
rename to utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt
diff --git a/utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt b/utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt
rename to utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt
diff --git a/utility/src/test/java/org/oppia/util/system/OppiaDateTimeFormatterTest.kt b/utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt
similarity index 100%
rename from utility/src/test/java/org/oppia/util/system/OppiaDateTimeFormatterTest.kt
rename to utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt