Switched over to gradle build