Revert^2 "Moving rearrangementExists to ReorderLogic since it's only used there"

This reverts commit 484a7ea4f394d48ccf40d019854c7ee320f9ae85.

Reason for revert: Fixing build error 

Change-Id: I00dcbb831dc40a90d43ada7315969251413bb88b
4 files changed