Fixing up entry points to have 'main()' to be called.

Signed-off-by: Rob Dobson <rob@rdobson.co.uk>
Merge branch 'refactor'