Adjusted spring config and reordered packages