model module refactor
Merge pull request #53 from patriot1burke/master

model module refactor