refactor spring package