halfway through reorganizing Signal classes
merging and more reorg
test simulator fix