Better organization of the classes