828: rearrange solution folders