Changed files to cleaner format.