updated code layout
Merge branch 'master' of https://github.com/Musepig1995/programming-assignment