Added Boom and Hook classes, removed unused classes from 2012 code