Made files refactoring