NoMvvm sample - and some general reorganisation