misc: Done some tidying
Merge pull request #1 from ben-gibson/feature/Improve-structure

misc: Done some tidying