moved classes out of plugin.groovy