added a package header and changed the name of the classes