Architectural refactoring.