Rearranged File Hierarchy.