Restructure the tree
Merge pull request #1 from wkshum99/4-12

Restructure the tree