re-organize path structure