restructure spring config