minor refactor, separation of external modules
Merge branch 'master' of https://github.com/nityas/6869-finalproject
Refactor merges:wq