fix typo in build.gradle
fix folder and package structures from incorrect re-organisation of folder structure
update build script
Merge branch 'release/2.1.2'