Revert "Revert "attempt 2 at moving everything up""

This reverts commit acd7be2c5baa3c7b28ec686d8c389bcae1507cc3.