Changed around some file locations