Revised core vs component tasks.
Splitting core class functionality into separate tasks.