Architectural refactorings.