Solution Refactoring