Consolidation of tools, cleanup of signal handling API

Signed-off-by: Frank Mertens <frank@cyblogic.de>