changed to use the class, and delete unused files