These classes were refactored in a previous PR. Everything in currently named Dependencies.java should be sufficient (minus what you added, if any)