updated boiletplate files and normalize