Modified solution folder structure