Renamed some files and goals