Package renames and such
GitHub won't commit
Subproject is dirty