Seperate classes for both project and task #4579