Reorganised stuff
Merge pull request #14 from MrRatermat/patch-10

Reorganised stuff