Adjust for cargo and new directory layout