Solution structure refactoring