files refactor