Refactoring several files.