Refactoring done

New delegate/event naming conventions