Move Subscription class to its own file. Tidy up requires.