refactor sonata user bundle