Modified all the files to avoid clutter.