Changed file names and resources