Refactored some of the naming. And added few more - annotation/properties
based spring config.