Switched everything to use the new 'app' format.
Corrected shared test code EMAILING and FTU.
Just maign sure I'm up to date.
Merge pull request #18 from roydude/v1-train

V1 train