Changed some file locations around