re-organiizing files
Remove problems with leading and trailing whitespaces