more reorg/cleanup
update typechecker jar