Resolve "Implement builders for events and restructure listeners accordingly"
requested to merge 20-implement-builders-for-events-and-restructure-listeners-accordingly into master
Closes #20
Latest commit version has been tested in Eclipse and appears to work.