obanyc-1974 tweak to TCIP XSD, and refactoring of module, cleanup