add connection and handler directories to output
Merge remote-tracking branch 'origin/master'
use bean definitions for easier groovy access