Config cleanup.

Using @ComponentScan instead of xml files.