Renamed packages so as to keep it consistent team-wide