Revert "Revert "Move Some Stuff Around""

This reverts commit 5549c4c7364e984eb03336911d6045805f6913af.