event types and better folder naming