code reorganization
Merge branch 'master' of https://github.com/anogowski/PRO160_Team7_Project