Added Events Scaffold, cleaned up the scaffold