rearranged file locations