muve to gradle and refactor code