removed unused classes
extracted CollectionUtil
attempt to split plugin.groovy