Fixed file name formatting
Did some more work on event and manager class