Continued to refactor, removed TweenEvent.h