module and viewmodel tidyup
Merge branch 'master' into ModuleRefactoring
Merge pull request #13 from phillip-haydon/ModuleRefactoring

Module refactoring