rearrange configs to be under bundle declarations, other crap