Refactoring code to make service listener code reusable.
Merge branch 'master' of https://github.com/uiucseclab/MagBastard