Reorganizing and testing