Given the classes a more suitable name and package