Updated import paths for vendoring