Annnd renaming things back so I don't have to mess with source package locations