Renamed the packages according to the convention that we agreed.