organise imports
Merge pull request #21 from ollyjshaw/imports

organise imports