Renamed and separated files