Migrate Monitor and Event methods to sub-namespace.
Minor cleanup