Revert "Move some stuff."

This reverts commit a1f0e1653fa0834889882af71d755adf077a56d5.