changed paths to deal with new directory structure