Refactored dependencies to get rid of broken satis repo (WIP)