Mode NormalMode and CheckMode into Mode

[liampan]

Make both Modes in names space of Mode

Bug fix / New feature (delete as appropriate)

Currently NormalMode and CheckMode do not live with inside Mode, this creates a name space issue if you try to use them from another package

Fixes # (issue)

Checklist

• I've included appropriate unit tests with any code I've added
• I've tested by creating a new service from my fork, applying any scaffolds I've changed, and checking that all unit tests pass and the service runs as expected
• I've added my code using logical, atomic commits

[wolfendale]

@liampan just tried to create a project from this and it fails to compile even without running the scaffolds. Could you fix this and test the rest of the scaffolds. Otherwise, I'm happy with the idea.

[liampan]

@wolfendale Have now scaffolded project and one of each page type and successful sbt compile run

Ohh wait hang fire sbt test 2 ticks