Updated for new target directory structure