Some refactoring of files.