Renamed the files and some of the methods