Renamed and organized files