Fix #7 (AutoHelp) and did some refactoring and reorganizing.

Signed-off-by: robhol <email@robhol.net>