moved spring classes to S13