Update import paths with new repo location
Update for new version