MAINT: shuffle functions around more