Rearranged some file locations