Refactor dependency management to import upstream artifacts