Merge pull request #8 from roydude/v1-train

V1 train
Moved all apps methods to individual files etc.. (see issue #16).