Consolidate the Skilltree

Closes #37