Revert "moved things around a bit"

This reverts commit f815f58beac9863d6d6fe21b265b368356812c01.