Renamed packages and updated gitignore