Move notification classes into ui

Make logical sense...