Moved all the files back to main directory and renamed various file paths
Merge branch 'master' of https://github.com/zarazha/ICS169GroupV
Moved files to main directory and renamed various file paths