reorganizing for deployment