Would it be a good time to migrate the 2.0.0 changes to the spm compatible branch `feature/add-spm-support`?