updating versions of spring in build dependencies, moving some stuff
around, removing unused stuff, etc.