Add files.
Remove all underscore references.