Building refactored and gradle wrapper added