Simplify model
Move spec file for NotificationView
Move spec files