Reengineering of basic architecture