pm : re-organize