Updates to gradle + push all new classes

Resolving issues with gradle and pushing new classes to resolve CI issues.