cleanup / reorder includes
use springbundle for spring version detection