Changed spring templates to reflect changes in package naming.