Added packages & Fixed Minor Bugs

Fixed bug when user was subscribing on a same match more than once and
also added packaging. Removed some unnecessary code as well.