Updated the changes to work with the new repo structure.