Add Events class
Add Config class