Split Task model into smaller classes