Refactored code and added WebService Module (will be Spring in Future)