Migrated to preferred gradle structure