refactoring subscriptionStore and subscription manager for separation of...

... concerns.