Refactoring towards a better solution layout.