started refactoring, new method 'files'