Cleanup of task and service
Moved tasks out of modules
Moved labels out of modules