Update Spring to RC1
Change package name to reflect reversion to previous package naming scheme.