Update PR Hw6, and restructure dir tree