Reorganised solution folder