Spring files refactor