Refactor relationships; removed TaskSet in favor of just Task