Added upload and distribute (i.e.: package+upload)