Revert "Rearranging"

This reverts commit 8d8dc3b46615d1be9c6de597a94c2e34e5d0eb14.
Getting back up to date