Re-named files to conform to standards