Refactored solution file