Rearrange solution's folders structure