Fixed celery kwargs and memory issues
Moved modules into packages