massive reorganization to support multiple applications