modularized models and views
Merge pull request #3 from JoshSGman/master

modularized models and views