clean up and refactor
project reorg. added ISDemo and Modeler