Updated for new target directory layout