Rearranged the file structure.