Merge changes Idbb63960,Id7889566

* changes:
  Delete some unused resources
  Move all contextual card related classes.