Refactoring solution structure