Pab/devel

Mostly a change to the name of aldormain.c - it now prefixes it with the entry point name.