Task class now in correct place