Revert "attempt 2 at moving everything up"

This reverts commit 40751b721a4879316231631007640115e5eefcc0.