refactoring classes
refactoring classes
updated to new gradle tools