Homework 2, Revision 2.

1. Folders restruct.
2. Bugfix according to code review.