code refactoring - using component scan

Change-Id: Idce5f1d740517f6761ddc0f54e903e203c64ec1f