Architectual refactoring.