Split files, add comments