Also re-organized the dependencies.gradle file. Not all caps/pins are removed at this point, but I think this is enough change for one PR.