Refactored code. Cleaned up maven dependencies. Added Autowired annotation support