cleanup / consistency work
refactoring and cleanup
continue refactoring; added models and util