re-org path elements