Re-organize OJ utilities