Reorganized folder structure for solution folder