Refactor packaging a bit to not require celery