Revert "add component classes"

This reverts commit 0dd62784aa185a8a89c70f40767993e7f8269876.