Rename "observers.php" to "events.php"
Merge branch 'dev'