Slight structure change
Merge branch 'master' of github.com:yyjhao/NUSMorge