Re-arranged things to match the highlights at the top
Put Spring before the code-level features to group things a little bit better