Moved Tobben's code + all Subscription handling code to it's own package