Change some files to use Spring annotation configuration instead of XML configuration.