Removed unused classes.

Moved Spring FactoryBeans to separate package.