Breaking up in more classes