Renamed files and updated functions