rename files per standards, remove comments