Moving Class Components to Subclass(es)