Rearranged file structure.