Remove comments
Renamed files