reorganizing build / properties