Changing organization of models and events.  Begin work on sprint