Renamed files, fixed header comment