Changed file locations due to package