Reorganized the tree of the package.