Some refactoring
gradle wrapper upgrade