Move things around to fix autoloading.