Rename some packages for better organization.