moved files into model package
Merge pull request #7 from jsuit/master

making sure everything is up-to-date