Migrating to gradle