Rearrange project in folders