some renaming, namespaces reordering and methods from event handler provider moved to extensions for better extensibility