Refactored solution folder