Minor refactoring in solution and path