overrides to get rid of double packages
git subtree became official