added more support for the git plugin
set resolveStrategy to DELEGATE_FIRST so that nested contexts can use methods names already existing in outer contexts
moved inner classes to separate files