Package renaming, minor tweaks
Renamed packages