Doing some restructuring; Added hipchat handler