Reorganize semiauto harness
Merge pull request #39 from andreastt/ato/reorg-2

Reorganize semiauto harness