Migrated to gradle build system