Revert "Moving things around (breaking commit)"

This reverts commit f4ab6769cb9e92a73a17e2bec1ad4931fd4bc311.