refs #71 rearrange the info schema code