Extracted class- and instance- into separate files