Changed hierarchy to match yours.
Merge branch 'master' of https://github.com/stuycs-apcs-z/hw