Rearranged the file tree.