refactored file name decorators to be Spring-managed beans