Move Spring classes to new package.