Re-organize paths