Adapting build scripts to latest implementation changes.
Extracting node annotation into a seperate java file.
Minor changes.