Modifying task setup to account for new directory structure