Fixing dependency references; avoiding git submodules.