Refactoring. Own files.