Moved things around in preparation for 1.2 support