Rearrange / tidy project paths