Remove unnecessarily deep receiver package
Remove auto-generated class header
Minor cleanup of Notifier