restructure using XInclude to make teisimple.odd real