Reorganizing architecture