- Fix compile errors - MOve consumer key split into Subscription to allow better testing - move models to extra file - adopt API changes