Move included class files into includes, make including views easier.
Merge pull request #9 from GaryJones/feature/refactor

Move included class files into includes, make including views easier.