Revert "Arranged Part 1"

This reverts commit 9a19901520efa8a695917dba43f6a0265538e7ce.