Moving default/static classes out of interface and into base class