diff --git a/quickstep/src/com/android/launcher3/uioverrides/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/TaskViewTouchController.java
similarity index 100%
rename from quickstep/src/com/android/launcher3/uioverrides/TaskViewTouchController.java
rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/TaskViewTouchController.java
diff --git a/quickstep/src/com/android/quickstep/MultiStateCallback.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/MultiStateCallback.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/MultiStateCallback.java
diff --git a/quickstep/src/com/android/quickstep/OverviewTouchConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewTouchConsumer.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/OverviewTouchConsumer.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewTouchConsumer.java
diff --git a/quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepProcessInitializer.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/QuickstepProcessInitializer.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepProcessInitializer.java
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java
diff --git a/quickstep/src/com/android/quickstep/SwipeSharedState.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/SwipeSharedState.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeSharedState.java
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/TaskOverlayFactory.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/TaskSystemShortcut.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
diff --git a/quickstep/src/com/android/quickstep/TouchConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchConsumer.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/TouchConsumer.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/TouchConsumer.java
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionLog.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionLog.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/TouchInteractionLog.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionLog.java
diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java
diff --git a/quickstep/src/com/android/quickstep/util/RecentsAnimationListenerSet.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/util/RecentsAnimationListenerSet.java
diff --git a/quickstep/src/com/android/quickstep/util/SwipeAnimationTargetSet.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/SwipeAnimationTargetSet.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/util/SwipeAnimationTargetSet.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/util/SwipeAnimationTargetSet.java
diff --git a/quickstep/src/com/android/quickstep/util/TaskViewDrawable.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewDrawable.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/util/TaskViewDrawable.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewDrawable.java
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/ClearAllButton.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/ClearAllButton.java
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java
diff --git a/quickstep/src/com/android/quickstep/views/IconView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/IconView.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/IconView.java
diff --git a/quickstep/src/com/android/quickstep/views/LiveTileOverlay.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/LiveTileOverlay.java
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/RecentsView.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/TaskMenuView.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
similarity index 100%
rename from quickstep/src/com/android/quickstep/views/TaskView.java
rename to quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java