In future I may move most of the code out into an autoload file, but in the meantime I want all the code tidy and in one place for the next release