restructure project to suit gradle build - prior to re-import into eclipse
fix typo in build scripts
fix package refs
Merge branch 'release/2.1.1'