Renamed some files and finished ex17rb