started moving to gradle build an major refactoring