Revert "Moving abilities to component"

This reverts commit b719e28bab6118447bb3bd064ee93ca0d9439c15.
Revert "Revert "Moving abilities to component""

This reverts commit f0043cd93018cc34509f2bd8c82cff68768e1e60.