Reorganizing dependencies and changing versions

of gradle based on what Jenkins uses.