Refactor task repository
Merge task-control.iml