Tasks are now self adding to queue
Renamed files to match module names