tidy up, added viewmodels in modules