Cleanup some things and add a component.json to make SuperModel a separate Component module