Rearranged file locations