The version of Groovy that we are currently using has problems with inner class context. Move these to separate files.