group primitives by type; begin animation refactor
complete animation refactor
Merge branch 'anim'

* anim:
  complete animation refactor
  group primitives by type; begin animation refactor