Moving Class Components to the Superclass