Reorganized directory
Merge branch 'master' of https://github.com/AlonDaks/cs164-final-project